From 0bb88756b0d1cfa191236017b0e3b2a958766d11 Mon Sep 17 00:00:00 2001
From: Dmitry Kazakov <dimula73@gmail.com>
Date: Tue, 10 Nov 2015 22:44:06 +0300
Subject: [PATCH] Make the onion skins dialog look smaller by default

---
 .../dockers/animation/kis_equalizer_button.cpp           | 8 +++++++-
 .../extensions/dockers/animation/kis_equalizer_button.h  | 1 +
 .../dockers/animation/kis_equalizer_column.cpp           | 4 +---
 .../dockers/animation/kis_equalizer_slider.cpp           | 9 +++++++--
 .../extensions/dockers/animation/kis_equalizer_slider.h  | 1 +
 .../dockers/animation/kis_onion_skin_dialog.cpp          | 2 ++
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/krita/plugins/extensions/dockers/animation/kis_equalizer_button.cpp b/krita/plugins/extensions/dockers/animation/kis_equalizer_button.cpp
index 2a86dfb4f5..5e01b4a167 100644
--- a/krita/plugins/extensions/dockers/animation/kis_equalizer_button.cpp
+++ b/krita/plugins/extensions/dockers/animation/kis_equalizer_button.cpp
@@ -49,7 +49,7 @@ KisEqualizerButton::KisEqualizerButton(QWidget *parent)
       m_d(new Private(this))
 {
     setFocusPolicy(Qt::WheelFocus);
-    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 }
 
 KisEqualizerButton::~KisEqualizerButton()
@@ -137,6 +137,12 @@ QSize KisEqualizerButton::sizeHint() const
     return QSize(15, minHeight);
 }
 
+QSize KisEqualizerButton::minimumSizeHint() const
+{
+    QSize sh = sizeHint();
+    return QSize(10, sh.height());
+}
+
 void KisEqualizerButton::enterEvent(QEvent *event)
 {
     Q_UNUSED(event);
diff --git a/krita/plugins/extensions/dockers/animation/kis_equalizer_button.h b/krita/plugins/extensions/dockers/animation/kis_equalizer_button.h
index 061605112b..7519d2b514 100644
--- a/krita/plugins/extensions/dockers/animation/kis_equalizer_button.h
+++ b/krita/plugins/extensions/dockers/animation/kis_equalizer_button.h
@@ -33,6 +33,7 @@ public:
     void setRightmost(bool value);
 
     QSize sizeHint() const;
+    QSize minimumSizeHint() const;
 
     void enterEvent(QEvent *event);
     void leaveEvent(QEvent *event);
diff --git a/krita/plugins/extensions/dockers/animation/kis_equalizer_column.cpp b/krita/plugins/extensions/dockers/animation/kis_equalizer_column.cpp
index 3560aa2537..6727e117bc 100644
--- a/krita/plugins/extensions/dockers/animation/kis_equalizer_column.cpp
+++ b/krita/plugins/extensions/dockers/animation/kis_equalizer_column.cpp
@@ -41,20 +41,18 @@ KisEqualizerColumn::KisEqualizerColumn(QWidget *parent, int id, const QString &t
     : QWidget(parent),
       m_d(new Private)
 {
-    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     m_d->id = id;
 
     m_d->stateButton = new KisEqualizerButton(this);
     m_d->stateButton->setText(title);
     m_d->stateButton->setCheckable(true);
-    m_d->stateButton->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
     m_d->mainSlider = new KisEqualizerSlider(this);
     m_d->mainSlider->setRange(0, 100);
     m_d->mainSlider->setSingleStep(5);
     m_d->mainSlider->setPageStep(10);
-    m_d->mainSlider->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
 
     QVBoxLayout *vbox = new QVBoxLayout(this);
 
diff --git a/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.cpp b/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.cpp
index 27441e841a..6fe43557b8 100644
--- a/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.cpp
+++ b/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.cpp
@@ -50,7 +50,7 @@ KisEqualizerSlider::KisEqualizerSlider(QWidget *parent)
 {
     setOrientation(Qt::Vertical);
     setFocusPolicy(Qt::WheelFocus);
-    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 }
 
 KisEqualizerSlider::~KisEqualizerSlider()
@@ -128,7 +128,12 @@ void KisEqualizerSlider::mouseReleaseEvent(QMouseEvent *ev)
 
 QSize KisEqualizerSlider::sizeHint() const
 {
-    return QSize(15, 100);
+    return QSize(25, 150);
+}
+
+QSize KisEqualizerSlider::minimumSizeHint() const
+{
+    return QSize(10, 100);
 }
 
 void KisEqualizerSlider::paintEvent(QPaintEvent *event)
diff --git a/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.h b/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.h
index 0ca3fbd5df..33f1620154 100644
--- a/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.h
+++ b/krita/plugins/extensions/dockers/animation/kis_equalizer_slider.h
@@ -37,6 +37,7 @@ public:
     void paintEvent(QPaintEvent *event);
 
     QSize sizeHint() const;
+    QSize minimumSizeHint() const;
 
     void setRightmost(bool value);
 
diff --git a/krita/plugins/extensions/dockers/animation/kis_onion_skin_dialog.cpp b/krita/plugins/extensions/dockers/animation/kis_onion_skin_dialog.cpp
index 5ce34aac2b..d0cc650912 100644
--- a/krita/plugins/extensions/dockers/animation/kis_onion_skin_dialog.cpp
+++ b/krita/plugins/extensions/dockers/animation/kis_onion_skin_dialog.cpp
@@ -73,6 +73,8 @@ KisOnionSkinDialog::KisOnionSkinDialog(QWidget *parent) :
 
     loadSettings();
     KisOnionSkinCompositor::instance()->configChanged();
+
+    resize(sizeHint());
 }
 
 KisOnionSkinDialog::~KisOnionSkinDialog()
-- 
GitLab