summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-01-18 11:26:01 (GMT)
committerThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-01-18 12:16:55 (GMT)
commitb964f682dccc0bc62cb88794edc53815133762f2 (patch)
tree4f0123763d53a4604999ffb86ca3f98e33ccea43
parent2ac8bfb8a6698678c9e1c15e0717b69d43f79336 (diff)
downloadswift-b964f682dccc0bc62cb88794edc53815133762f2.zip
swift-b964f682dccc0bc62cb88794edc53815133762f2.tar.bz2
Return focus to highlight rules dialog after picking a colour
This patch fixes an issue where the Highlight and notification configuration window was losing focus after picking a colour for some of the highlight rules. Test-Information: Tested the changes and that the highlight rules dialog is no longer pushed back after picking a colour. Tested on MacOS (10.10.5) with Qt 5.5.1 and on Windows 10 with Qt 5.9. Change-Id: I509bb3f79e2f8e121dafe178e52a0aac5271ee1b
-rw-r--r--Swift/QtUI/QtColorToolButton.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swift/QtUI/QtColorToolButton.cpp b/Swift/QtUI/QtColorToolButton.cpp
index b349a47..6452cf4 100644
--- a/Swift/QtUI/QtColorToolButton.cpp
+++ b/Swift/QtUI/QtColorToolButton.cpp
@@ -36,6 +36,7 @@ void QtColorToolButton::setColor(const QColor& color)
void QtColorToolButton::onClicked()
{
QColor c = QColorDialog::getColor(color_, this);
+ window()->raise();
if (c.isValid()) {
setColor(c);
}