[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/calligra/2.9] krita/plugins/extensions/dockers/colorslider: Calculate the label's width
From:       Moritz Molch <kde () moritzmolch ! de>
Date:       2015-04-30 20:24:18
Message-ID: E1Ynv0M-0004kY-Ob () scm ! kde ! org
[Download RAW message or body]

Git commit 89068fce5a6147eb911b25de2fd708a584b02c10 by Moritz Molch.
Committed on 30/04/2015 at 20:24.
Pushed by mmolch into branch 'calligra/2.9'.

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

M  +0    -1    krita/plugins/extensions/dockers/colorslider/kis_color_slider_input.cpp
 M  +28   -0    krita/plugins/extensions/dockers/colorslider/kis_color_slider_widget.cpp


http://commits.kde.org/calligra/89068fce5a6147eb911b25de2fd708a584b02c10

diff --git a/krita/plugins/extensions/dockers/colorslider/kis_color_slider_input.cpp \
b/krita/plugins/extensions/dockers/colorslider/kis_color_slider_input.cpp index \
                fba9911..2ec33a3 100644
--- a/krita/plugins/extensions/dockers/colorslider/kis_color_slider_input.cpp
+++ b/krita/plugins/extensions/dockers/colorslider/kis_color_slider_input.cpp
@@ -78,7 +78,6 @@ void KisColorSliderInput::init()
     }
     
     QLabel* m_label = new QLabel(i18n("%1:", m_name), this);
-    m_label->setMinimumWidth(60);
     m_layout->addWidget(m_label);
 
     m_hsvSlider = new KisHSVSlider(Qt::Horizontal, this, m_displayRenderer, \
                m_canvas);
diff --git a/krita/plugins/extensions/dockers/colorslider/kis_color_slider_widget.cpp \
b/krita/plugins/extensions/dockers/colorslider/kis_color_slider_widget.cpp index \
                a6a5bc2..74efb3c 100644
--- a/krita/plugins/extensions/dockers/colorslider/kis_color_slider_widget.cpp
+++ b/krita/plugins/extensions/dockers/colorslider/kis_color_slider_widget.cpp
@@ -172,8 +172,10 @@ void KisColorSliderWidget::updateTimeout()
 void KisColorSliderWidget::setSlidersVisible(QBitArray SlidersConfigArray)
 {
     //qDebug()<<"check2";
+    QList<KisColorSliderInput*> visibleInputs;
     
     if (SlidersConfigArray[0]==true) {
+        visibleInputs.append(hsvH);
         hsvH->setVisible(true);
         connect(hsvH, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsvH, SLOT(update()));
@@ -193,6 +195,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[1]==true) {
+        visibleInputs.append(hsvS);
         hsvS->setVisible(true);
         connect(hsvS, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsvS, SLOT(update()));
@@ -212,6 +215,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[2]==true) {
+        visibleInputs.append(hsvV);
         hsvV->setVisible(true);
         connect(hsvV, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsvV, SLOT(update()));
@@ -231,6 +235,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[3]==true) {
+        visibleInputs.append(hslH);
         hslH->setVisible(true);
         connect(hslH, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hslH, SLOT(update()));
@@ -250,6 +255,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[4]==true) {
+        visibleInputs.append(hslS);
         hslS->setVisible(true);
         connect(hslS, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hslS, SLOT(update()));
@@ -269,6 +275,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[5]==true) {
+        visibleInputs.append(hslL);
         hslL->setVisible(true);
         connect(hslL, SIGNAL(updated()), this,  SLOT(update()));
         connect(this, SIGNAL(updated()), hslL, SLOT(update()));
@@ -288,6 +295,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[6]==true) {
+        visibleInputs.append(hsiH);
         hsiH->setVisible(true);
         connect(hsiH, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsiH, SLOT(update()));
@@ -307,6 +315,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[7]==true) {
+        visibleInputs.append(hsiS);
         hsiS->setVisible(true);
         connect(hsiS, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsiS, SLOT(update()));
@@ -326,6 +335,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[8]==true) {
+        visibleInputs.append(hsiI);
         hsiI->setVisible(true);
         connect(hsiI, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsiI, SLOT(update()));
@@ -345,6 +355,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[9]==true) {
+        visibleInputs.append(hsyH);
         hsyH->setVisible(true);
         connect(hsyH, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsyH, SLOT(update()));
@@ -364,6 +375,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[10]==true) {
+        visibleInputs.append(hsyS);
         hsyS->setVisible(true);
         connect(hsyS, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsyS, SLOT(update()));
@@ -383,6 +395,7 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
SlidersConfigArray)  }
 
     if (SlidersConfigArray[11]==true) {
+        visibleInputs.append(hsyY);
         hsyY->setVisible(true);
         connect(hsyY, SIGNAL(updated()), this, SLOT(update()));
         connect(this, SIGNAL(updated()), hsyY, SLOT(update()));
@@ -401,6 +414,21 @@ void KisColorSliderWidget::setSlidersVisible(QBitArray \
                SlidersConfigArray)
         disconnect(hsyY, SIGNAL(toneUpdated(int, int)), this, SLOT(toneUpdate(int, \
int)));  }
 
+    QList<QLabel*> labels;
+    int labelWidth = 0;
+
+    Q_FOREACH (KisColorSliderInput* input, visibleInputs) {
+        Q_FOREACH (QLabel* label, input->findChildren<QLabel*>()) {
+            labels.append(label);
+            labelWidth = qMax(labelWidth, label->sizeHint().width());
+        }
+    }
+
+    Q_FOREACH (QLabel *label, labels) {
+        label->setMinimumWidth(labelWidth);
+    }
+
+
     updateTimeout();
 }
 void KisColorSliderWidget::slotConfigChanged()


[prev in list] [next in list] [prev in thread] [next in thread]