Commit f7971aab authored by Scott Petrovic's avatar Scott Petrovic

BUG:407646 Onion skin docker minimum width

parent 92a9a440
......@@ -51,6 +51,7 @@ KisEqualizerWidget::KisEqualizerWidget(int maxDistance, QWidget *parent)
QHBoxLayout *layout = new QHBoxLayout(this);
layout->setSpacing(0);
layout->setMargin(0);
for (int i = -m_d->maxDistance; i <= m_d->maxDistance; i++) {
KisEqualizerColumn *c = new KisEqualizerColumn(this, i, QString::number(i));
......
......@@ -47,6 +47,9 @@ OnionSkinsDocker::OnionSkinsDocker(QWidget *parent) :
KisImageConfig config(true);
ui->setupUi(mainWidget);
mainWidget->setContentsMargins(10, 10, 10, 10);
ui->doubleTintFactor->setMinimum(0);
ui->doubleTintFactor->setMaximum(100);
ui->doubleTintFactor->setPrefix(i18n("Tint: "));
......@@ -125,6 +128,9 @@ OnionSkinsDocker::OnionSkinsDocker(QWidget *parent) :
loadSettings();
KisOnionSkinCompositor::instance()->configChanged();
// this mostly hides the checkboxes since no filtering is done by default
slotFilteredColorsChanged();
resize(sizeHint());
}
......@@ -180,6 +186,15 @@ void OnionSkinsDocker::slotFilteredColorsChanged()
selectedFilterColors << 0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8; // show everything
}
ui->colorFilter0_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter1_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter2_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter3_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter4_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter5_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter6_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter7_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
ui->colorFilter8_checkbox->setVisible(ui->colorFilterGroupbox->isChecked());
// existing code
KisOnionSkinCompositor::instance()->setColorLabelFilter(selectedFilterColors);
......
......@@ -6,14 +6,31 @@
<rect>
<x>0</x>
<y>0</y>
<width>281</width>
<width>336</width>
<height>282</height>
</rect>
</property>
<property name="font">
<font>
<kerning>false</kerning>
</font>
</property>
<property name="windowTitle">
<string>Onion skin options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>12</number>
</property>
<property name="topMargin">
<number>12</number>
</property>
<property name="rightMargin">
<number>12</number>
</property>
<property name="bottomMargin">
<number>12</number>
</property>
<item>
<layout class="QVBoxLayout" name="slidersLayout">
<property name="spacing">
......@@ -35,10 +52,25 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>4</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="colorFilter0_checkbox">
<property name="minimumSize">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment