From 9c882d80795807336b8ac58fff29dbc306be2fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= Date: Thu, 19 May 2011 23:14:28 +0200 Subject: [PATCH] Don't apply base color when color dialog is cancelled 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 --- src/plugins/coreplugin/fancytabwidget.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index 2358e66eea5..e7782b8ded0 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -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;