feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't apply base color when color dialog is cancelled

Browse Source 
Previously setBaseColor used to refuse setting an invalid color. It
doesn't do this anymore, so let's just check for this case here.

Change-Id: Ie8a292ca809ac3838c8a52b91a9186dc5dbb992c
Reviewed-on: http://codereview.qt.nokia.com/28
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Thorbjørn Lindeijer
2011-05-19 23:14:28 +02:00
committed by Daniel Molkentin
parent 956bac297b
commit 9c882d8079
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/fancytabwidget.cpp
View File

@@ -365,8 +365,11 @@ public:
void mousePressEvent(QMouseEvent *ev)
{
if (ev->modifiers() & Qt::ShiftModifier)
Utils::StyleHelper::setBaseColor(QColorDialog::getColor(Utils::StyleHelper::requestedBaseColor(), m_parent));
if (ev->modifiers() & Qt::ShiftModifier) {
QColor color = QColorDialog::getColor(Utils::StyleHelper::requestedBaseColor(), m_parent);
if (color.isValid())
Utils::StyleHelper::setBaseColor(color);
}
}
private:
QWidget *m_parent;