diff --git a/krita/plugins/extensions/dockers/animation/kis_equalizer_button.cpp b/krita/plugins/extensions/dockers/animation/kis_equalizer_button.cpp index 2a86dfb4f58346a72a8370574be371faf0023971..5e01b4a16726a3bddd052e1f4c510a9696633cb1 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 061605112b40c57bd334428f5d1c353ebe509501..7519d2b514cb865cfe234ea23caa89395396edb8 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 3560aa25374aacc60ccf7ca5c66e96ef834f5926..6727e117bc0fd0d43eb70deed9087737f55b9f49 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 27441e841ac42598f4d11ef297ea4e6f1cdbf6de..6fe43557b8fcecda2231fa5fb51cb1f50fdc3858 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 0ca3fbd5df1b32041ebee590f0ffdae3dd2d6864..33f1620154d343ac1af52e1d3974aea1f4a2a5f2 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 5ce34aac2b2a7731e1fcf5488495faea6dbbeee4..d0cc650912ccb5881d02305fd54a019a0f9f0399 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()