From b964f682dccc0bc62cb88794edc53815133762f2 Mon Sep 17 00:00:00 2001
From: Thanos Doukoudakis <thanos.doukoudakis@isode.com>
Date: Thu, 18 Jan 2018 11:26:01 +0000
Subject: 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

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);
     }
-- 
cgit v0.10.2-6-g49f6