diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-06-04 19:24:49 +0200 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-06-04 19:24:49 +0200 |
| commit | 5c17f3abe1c43539db613da78414bc0b27928814 (patch) | |
| tree | aeda95c710a5dd597d4e45a94f57729f0dc1a6dc /demos/qtdemo | |
| parent | b70c535fb096652def0c4f6df6f9cd2827fa9c97 (diff) | |
| parent | 398c022e8adefc6e71a6048da40c19f6169be831 (diff) | |
Merge commit 'origin/4.5'
Diffstat (limited to 'demos/qtdemo')
| -rw-r--r-- | demos/qtdemo/colors.cpp | 2 | ||||
| -rw-r--r-- | demos/qtdemo/mainwindow.cpp | 13 |
2 files changed, 3 insertions, 12 deletions
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp index 733b285507..b82de2f140 100644 --- a/demos/qtdemo/colors.cpp +++ b/demos/qtdemo/colors.cpp @@ -95,7 +95,7 @@ bool Colors::noTickerMorph = false; bool Colors::adapted = false; bool Colors::verbose = false; bool Colors::pause = true; -int Colors::fps = 100; +int Colors::fps = 60; int Colors::menuCount = 18; float Colors::animSpeed = 1.0; float Colors::animSpeedButtons = 1.0; diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp index 0da69b222e..858d389722 100644 --- a/demos/qtdemo/mainwindow.cpp +++ b/demos/qtdemo/mainwindow.cpp @@ -185,7 +185,6 @@ void MainWindow::switchTimerOnOff(bool on) if (on && !Colors::noTimerUpdate){ this->useTimer = true; - this->setViewportUpdateMode(QGraphicsView::NoViewportUpdate); this->fpsTime = QTime::currentTime(); this->updateTimer.start(int(1000 / Colors::fps)); } @@ -257,10 +256,6 @@ void MainWindow::tick() if (MenuManager::instance()->ticker) MenuManager::instance()->ticker->tick(); - this->viewport()->update(); - if (Colors::softwareRendering) - QApplication::syncX(); - if (this->useTimer) this->updateTimer.start(int(1000 / Colors::fps)); } @@ -428,9 +423,7 @@ void MainWindow::focusInEvent(QFocusEvent *) if (MenuManager::instance()->ticker) MenuManager::instance()->ticker->pause(false); - int code = MenuManager::instance()->currentMenuCode; - if (code == MenuManager::ROOT || code == MenuManager::MENU1) - this->switchTimerOnOff(true); + this->switchTimerOnOff(true); this->pausedLabel->setRecursiveVisible(false); } @@ -443,9 +436,7 @@ void MainWindow::focusOutEvent(QFocusEvent *) if (MenuManager::instance()->ticker) MenuManager::instance()->ticker->pause(true); - int code = MenuManager::instance()->currentMenuCode; - if (code == MenuManager::ROOT || code == MenuManager::MENU1) - this->switchTimerOnOff(false); + this->switchTimerOnOff(false); this->pausedLabel->setRecursiveVisible(true); } |