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

List:       kde-commits
Subject:    [kdenlive] src: Make the choose color widget more consistent with
From:       Till Theato <root () ttill ! de>
Date:       2011-11-24 14:23:06
Message-ID: 20111124142306.CF6C2A60A6 () git ! kde ! org
[Download RAW message or body]

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, QString color, \
QWidget *paren  layout->setSpacing(0);
 
     QLabel *label = new QLabel(text, this);
-    m_button = new KColorButton(stringToColor(color), this);
-    m_button->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-    ColorPickerWidget *picker = new ColorPickerWidget(this);
+
+    QWidget *rightSide = new QWidget(this);
+    QHBoxLayout *rightSideLayout = new QHBoxLayout(rightSide);
+    rightSideLayout->setContentsMargins(0, 0, 0, 0);
+    rightSideLayout->setSpacing(0);
+
+    m_button = new KColorButton(stringToColor(color), rightSide);
+//     m_button->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+    ColorPickerWidget *picker = 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(QColor)));
     connect(picker, SIGNAL(displayMessage(const QString&, int)), this, \
SIGNAL(displayMessage(const QString&, int)));


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