aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Koch <tobias.koch@nokia.com>2010-07-22 11:08:22 +0300
committerTomas Junnonen <tomas.junnonen@nokia.com>2010-07-23 13:58:22 +0300
commit2b7b53b9f0d2ae6ccddc01e9f3ea3fcc223b5b81 (patch)
tree8a8fe6f939ff173ddc9bb32887886524c9a7372d
parent32b1f4d0cbc7b14776ea3e5dc5368e4dcb5d5427 (diff)
Changes: use isOnDisplay to check for benchmark page in widgetsgallery timedemo
RevBy: Tomas Junnonen Details: detecting the presence of the benchmark page using isActiveWindow fails, if the window is obstructed by, e.g. a translucent notification window.
-rw-r--r--demos/widgetsgallery/panningbenchmark.cpp2
-rw-r--r--demos/widgetsgallery/staticpagebenchmark.cpp2
-rw-r--r--demos/widgetsgallery/timedemobenchmark.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/widgetsgallery/panningbenchmark.cpp b/demos/widgetsgallery/panningbenchmark.cpp
index 024f7b68..5e15ed8c 100644
--- a/demos/widgetsgallery/panningbenchmark.cpp
+++ b/demos/widgetsgallery/panningbenchmark.cpp
@@ -44,7 +44,7 @@ void PanningBenchmark::start()
{
MApplication::activeWindow()->setOrientationAngle(targetOrientationAngle);
MApplication::activeWindow()->setOrientationAngleLocked(true);
- if (!applicationPage->isActiveWindow()) {
+ if (!applicationPage->isOnDisplay()) {
connect(applicationPage, SIGNAL(appeared()), this, SLOT(waitBeforePanning()));
applicationPage->appear();
verifyAppearanceTimer->start(5000);
diff --git a/demos/widgetsgallery/staticpagebenchmark.cpp b/demos/widgetsgallery/staticpagebenchmark.cpp
index fd8cd7ee..5e68f18d 100644
--- a/demos/widgetsgallery/staticpagebenchmark.cpp
+++ b/demos/widgetsgallery/staticpagebenchmark.cpp
@@ -26,7 +26,7 @@ void StaticPageBenchmark::start()
{
MApplication::activeWindow()->setOrientationAngle(targetOrientationAngle);
MApplication::activeWindow()->setOrientationAngleLocked(true);
- if (!applicationPage->isActiveWindow()) {
+ if (!applicationPage->isOnDisplay()) {
connect(applicationPage, SIGNAL(appeared()), this, SLOT(stabilizeFps()));
applicationPage->appear();
verifyAppearanceTimer->start(5000);
diff --git a/demos/widgetsgallery/timedemobenchmark.cpp b/demos/widgetsgallery/timedemobenchmark.cpp
index 0a2532a6..747ce84f 100644
--- a/demos/widgetsgallery/timedemobenchmark.cpp
+++ b/demos/widgetsgallery/timedemobenchmark.cpp
@@ -22,7 +22,7 @@ void TimedemoBenchmark::setType(const QString& type) {
void TimedemoBenchmark::terminateIfNotAppeared() {
verifyAppearanceTimer->stop();
- if (applicationPage->isActiveWindow()) {
+ if (applicationPage->isOnDisplay()) {
return;
} else {
qCritical("Could not activate application page. Is a window manager running?");