From kde-commits  Thu Nov 24 14:23:06 2011
From: Till Theato <root () ttill ! de>
Date: Thu, 24 Nov 2011 14:23:06 +0000
To: kde-commits
Subject: [kdenlive] src: Make the choose color widget more consistent with
Message-Id: <20111124142306.CF6C2A60A6 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=132214466716507

Git commit b5a35dfbf5a5787dedb294dde776fefb847a6306 by Till Theato.
Committed on 24/11/2011 at 15:18.
Pushed by theato into branch 'master'.

Make the choose color widget more consistent with other parameter widgets.

M  +12   -5    src/choosecolorwidget.cpp

http://commits.kde.org/kdenlive/b5a35dfbf5a5787dedb294dde776fefb847a6306

diff --git a/src/choosecolorwidget.cpp b/src/choosecolorwidget.cpp
index e6f777d..36eb893 100644
--- a/src/choosecolorwidget.cpp
+++ b/src/choosecolorwidget.cpp
@@ -88,13 +88,20 @@ ChooseColorWidget::ChooseColorWidget(QString text, QStr=
ing color, QWidget *paren
     layout->setSpacing(0);
 =

     QLabel *label =3D new QLabel(text, this);
-    m_button =3D new KColorButton(stringToColor(color), this);
-    m_button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-    ColorPickerWidget *picker =3D new ColorPickerWidget(this);
+
+    QWidget *rightSide =3D new QWidget(this);
+    QHBoxLayout *rightSideLayout =3D new QHBoxLayout(rightSide);
+    rightSideLayout->setContentsMargins(0, 0, 0, 0);
+    rightSideLayout->setSpacing(0);
+
+    m_button =3D new KColorButton(stringToColor(color), rightSide);
+//     m_button->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy:=
:Fixed);
+    ColorPickerWidget *picker =3D new ColorPickerWidget(rightSide);
 =

     layout->addWidget(label);
-    layout->addWidget(m_button);
-    layout->addWidget(picker, 0, Qt::AlignRight);
+    layout->addWidget(rightSide);
+    rightSideLayout->addWidget(m_button);
+    rightSideLayout->addWidget(picker, 0, Qt::AlignRight);
 =

     connect(picker, SIGNAL(colorPicked(QColor)), this, SLOT(setColor(QColo=
r)));
     connect(picker, SIGNAL(displayMessage(const QString&, int)), this, SIG=
NAL(displayMessage(const QString&, int)));