aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kapusta <dominik.kapusta@teleca.com>2011-01-03 14:30:18 +0100
committerDominik Kapusta <dominik.kapusta@teleca.com>2011-01-03 14:32:10 +0100
commite09e555a107b02453e67cfbe9ac9a84f1d62080b (patch)
tree830052eea5144d45808da3fd215d1925131c3017
parent38efb15d480c215af064f3948959e5ae4b0fb392 (diff)
Changes: Update to MSceneManager's unit test.
RevBy: TrustMe Details: Regarding status bar geometry X property.
-rw-r--r--tests/ut_mscenemanager/ut_mscenemanager.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/ut_mscenemanager/ut_mscenemanager.cpp b/tests/ut_mscenemanager/ut_mscenemanager.cpp
index fc57437e..d00a369a 100644
--- a/tests/ut_mscenemanager/ut_mscenemanager.cpp
+++ b/tests/ut_mscenemanager/ut_mscenemanager.cpp
@@ -1164,12 +1164,16 @@ static QVector<unsigned long> windowGeometry(MSceneWindow* window)
{
QRectF rect = window->mapRectToScene(QRectF(QPointF(), window->geometry().size()));
QVector<unsigned long> vector;
- vector << rect.x() << rect.y() << rect.width();
-
- if (window->windowType() == MSceneWindow::StatusBar)
- vector << window->property("sharedPixmapHeight").value<qreal>();
- else
- vector << rect.height();
+ vector << rect.x() << rect.y();
+
+ if (window->windowType() == MSceneWindow::StatusBar) {
+ if (window->sceneManager()->orientation() == M::Landscape)
+ vector << rect.width() << window->property("sharedPixmapHeight").value<qreal>();
+ else
+ vector << window->property("sharedPixmapHeight").value<qreal>() << rect.height();
+ } else {
+ vector << rect.width() << rect.height();
+ }
return vector;
}