summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-06-09 17:47:45 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-06-09 17:51:14 (GMT)
commit31f52b2354f5bb5044592ad93cb4e9f7a9d43ae6 (patch)
treea765a6df7dc1e77ad0ffa99c2da717c3c3f760be /demos
parentf4548a337bbc348065e8341df9445bf0fc7bc241 (diff)
downloadQt-31f52b2354f5bb5044592ad93cb4e9f7a9d43ae6.zip
Qt-31f52b2354f5bb5044592ad93cb4e9f7a9d43ae6.tar.gz
Qt-31f52b2354f5bb5044592ad93cb4e9f7a9d43ae6.tar.bz2
BT: Fix missing animation in the Qt Demo Browser
Change 259b65c2f5d736dd7f6d81b6390f54464dd5f183 prevents the animation from running on Windows. This is a partial revert that still preserves most of the performance fixes. Reviewed-by: ogoffart
Diffstat (limited to 'demos')
-rw-r--r--demos/qtdemo/mainwindow.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 16ca95f..8055fec 100644
--- a/demos/qtdemo/mainwindow.cpp
+++ b/demos/qtdemo/mainwindow.cpp
@@ -430,7 +430,9 @@ void MainWindow::focusInEvent(QFocusEvent *)
if (MenuManager::instance()->ticker)
MenuManager::instance()->ticker->pause(false);
- this->switchTimerOnOff(true);
+ int code = MenuManager::instance()->currentMenuCode;
+ if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+ this->switchTimerOnOff(true);
this->pausedLabel->setRecursiveVisible(false);
}
@@ -443,7 +445,9 @@ void MainWindow::focusOutEvent(QFocusEvent *)
if (MenuManager::instance()->ticker)
MenuManager::instance()->ticker->pause(true);
- this->switchTimerOnOff(false);
+ int code = MenuManager::instance()->currentMenuCode;
+ if (code == MenuManager::ROOT || code == MenuManager::MENU1)
+ this->switchTimerOnOff(false);
this->pausedLabel->setRecursiveVisible(true);
}