[Pkg-owncloud-commits] [owncloud-client] 35/83: Fix Pref window for good

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 3f724e1c6acb9d8ad7fc4c4c30bad77cd3d1c907
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon May 26 09:36:59 2014 +0200

    Fix Pref window for good
    
    This was forgotten in 18677dbc3fad086f9a0a8c129d37a8799d1c65e0
---
 src/mirall/utility.cpp | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp
index 9664534..1b7b3ee 100644
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -167,22 +167,11 @@ QByteArray Utility::userAgentString()
 void Utility::raiseDialog( QWidget *raiseWidget )
 {
 #ifndef TOKEN_AUTH_ONLY
-    // viel hilft viel ;-)
-    if( raiseWidget ) {
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) && \
-    (defined(Q_OS_WIN) || defined (Q_OS_MAC))
-        Qt::WindowFlags eFlags = raiseWidget->windowFlags();
-        if (!(eFlags & Qt::WindowStaysOnTopHint)) {
-            eFlags |= Qt::WindowStaysOnTopHint;
-            raiseWidget->setWindowFlags(eFlags);
-            raiseWidget->show();
-            eFlags &= ~Qt::WindowStaysOnTopHint;
-            raiseWidget->setWindowFlags(eFlags);
-        }
-#endif
-        raiseWidget->show();
-        raiseWidget->raise();
-        raiseWidget->activateWindow();
+    if( raiseWidget && raiseWidget->parentWidget() == 0) {
+        raiseWidget->hide();
+        // Qt has a bug which causes parent-less dialogs to pop-under.
+        raiseWidget->setWindowFlags(raiseWidget->windowFlags() & ~Qt::Dialog);
+        raiseWidget->showNormal();
     }
 #endif
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git