[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace] kwin/kcmkwin/kwincompositing: add delay before reinit confirmation
From:       Thomas_Lübking <thomas.luebking () gmail ! com>
Date:       2012-04-30 20:38:03
Message-ID: 20120430203803.652E9A60CD () git ! kde ! org
[Download RAW message or body]

Git commit 0b699ba3bd2a888d16a6011647671cfa0295bfa7 by Thomas Lübking.
Committed on 30/04/2012 at 22:08.
Pushed by luebking into branch 'master'.

add delay before reinit confirmation
required to mitigate false positives due to threaded init code

REVIEW: 104799

M  +4    -1    kwin/kcmkwin/kwincompositing/main.cpp
M  +1    -0    kwin/kcmkwin/kwincompositing/main.h

http://commits.kde.org/kde-workspace/0b699ba3bd2a888d16a6011647671cfa0295bfa7

diff --git a/kwin/kcmkwin/kwincompositing/main.cpp b/kwin/kcmkwin/kwincompositing/main.cpp
index 34ecae1..90655ad 100644
--- a/kwin/kcmkwin/kwincompositing/main.cpp
+++ b/kwin/kcmkwin/kwincompositing/main.cpp
@@ -573,7 +573,10 @@ void KWinCompositingConfig::save()
 
     if (m_showConfirmDialog) {
         m_showConfirmDialog = false;
-        showConfirmDialog(advancedChanged);
+        if (advancedChanged)
+            QTimer::singleShot(1000, this, SLOT(confirmReInit()));
+        else
+            showConfirmDialog(false);
     }
 }
 
diff --git a/kwin/kcmkwin/kwincompositing/main.h b/kwin/kcmkwin/kwincompositing/main.h
index 94c62de..bd29509 100644
--- a/kwin/kcmkwin/kwincompositing/main.h
+++ b/kwin/kcmkwin/kwincompositing/main.h
@@ -75,6 +75,7 @@ public slots:
     void initEffectSelector();
 
 private slots:
+    void confirmReInit() { showConfirmDialog(true); }
     void rearmGlSupport();
     void suggestGraphicsSystem();
     void toogleSmoothScaleUi(int compositingType);

[prev in list] [next in list] [prev in thread] [next in thread]