summaryrefslogtreecommitdiff
path: root/src/mcompositewindow.cpp
diff options
context:
space:
mode:
authorAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-07-15 19:16:48 +0300
committerAbdiel Janulgue <abdiel.janulgue@nokia.com>2010-07-15 19:16:48 +0300
commite56ac653d8c2cc9469413dcdb49034a2f5ba493a (patch)
treed1f1d4de41c4d759f715b326eee761e792ac809e /src/mcompositewindow.cpp
parenta0419cc1fa70a36874f84e157cc4821e120e1c5f (diff)
Changes: merged request #6 with fix for animation regression
RevBy: TrustMe
Diffstat (limited to 'src/mcompositewindow.cpp')
-rw-r--r--src/mcompositewindow.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/mcompositewindow.cpp b/src/mcompositewindow.cpp
index d11cce9..bbaff27 100644
--- a/src/mcompositewindow.cpp
+++ b/src/mcompositewindow.cpp
@@ -238,6 +238,16 @@ void MCompositeWindow::fadeIn()
if (!isAppWindow())
return;
+ ++window_transitioning;
+ if (newly_mapped)
+ QTimer::singleShot(700, this, SLOT(q_fadeIn()));
+ else
+ q_fadeIn();
+}
+
+void MCompositeWindow::q_fadeIn()
+{
+ --window_transitioning;
newly_mapped = false;
setVisible(true);
setOpacity(0.0);