Git commit 9d111c3d9719bc93534dcef83368e8a55f2f0059 by Moritz Molch.
Committed on 30/04/2015 at 21:10.
Pushed by mmolch into branch 'calligra/2.9'.

Calculate the label's width in the specific color selector dock instead
of using a fixed value

M  +0    -1    krita/plugins/extensions/dockers/specificcolorselector/kis_c=
olor_input.cc
M  +15   -0    krita/plugins/extensions/dockers/specificcolorselector/kis_s=
pecific_color_selector_widget.cc

http://commits.kde.org/calligra/9d111c3d9719bc93534dcef83368e8a55f2f0059

diff --git a/krita/plugins/extensions/dockers/specificcolorselector/kis_col=
or_input.cc b/krita/plugins/extensions/dockers/specificcolorselector/kis_co=
lor_input.cc
index 3dbf3da..43cb428 100644
--- a/krita/plugins/extensions/dockers/specificcolorselector/kis_color_inpu=
t.cc
+++ b/krita/plugins/extensions/dockers/specificcolorselector/kis_color_inpu=
t.cc
@@ -51,7 +51,6 @@ void KisColorInput::init()
     m_layout->setSpacing(1);
 =

     QLabel* m_label =3D new QLabel(i18n("%1:", m_channelInfo->name()), thi=
s);
-    m_label->setMinimumWidth(50);
     m_layout->addWidget(m_label);
 =

     m_colorSlider =3D new KoColorSlider(Qt::Horizontal, this, m_displayRen=
derer);
diff --git a/krita/plugins/extensions/dockers/specificcolorselector/kis_spe=
cific_color_selector_widget.cc b/krita/plugins/extensions/dockers/specificc=
olorselector/kis_specific_color_selector_widget.cc
index 81a97d4..ea89c00 100644
--- a/krita/plugins/extensions/dockers/specificcolorselector/kis_specific_c=
olor_selector_widget.cc
+++ b/krita/plugins/extensions/dockers/specificcolorselector/kis_specific_c=
olor_selector_widget.cc
@@ -141,6 +141,21 @@ void KisSpecificColorSelectorWidget::setColorSpace(con=
st KoColorSpace* cs)
             }
         }
     }
+
+    QList<QLabel*> labels;
+    int labelWidth =3D 0;
+
+    Q_FOREACH (KisColorInput* input, m_inputs) {
+        Q_FOREACH (QLabel* label, input->findChildren<QLabel*>()) {
+            labels.append(label);
+            labelWidth =3D qMax(labelWidth, label->sizeHint().width());
+        }
+    }
+
+    Q_FOREACH (QLabel *label, labels) {
+        label->setMinimumWidth(labelWidth);
+    }
+
     bool allChannels8Bit =3D true;
     foreach (KoChannelInfo* channel, channels) {
         if (channel->channelType() =3D=3D KoChannelInfo::COLOR && channel-=
>channelValueType() !=3D KoChannelInfo::UINT8) {