diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2009-06-09 17:47:45 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-10 03:56:59 (GMT) |
| commit | df9435e7aacc427e0e0658bdc83a32dadf24b745 (patch) | |
| tree | e6d3b1d1d2b8805b14c2f0cbeda98cfd38bb5659 | |
| parent | d07565a33c51362de4743de6ed4ad6affeab17b3 (diff) | |
| download | Qt-df9435e7aacc427e0e0658bdc83a32dadf24b745.zip Qt-df9435e7aacc427e0e0658bdc83a32dadf24b745.tar.gz Qt-df9435e7aacc427e0e0658bdc83a32dadf24b745.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
(cherry picked from commit 31f52b2354f5bb5044592ad93cb4e9f7a9d43ae6)
| -rw-r--r-- | demos/qtdemo/mainwindow.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp index 9c1d1f5..029af0e 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); } |