aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Kapusta <dominik.kapusta@teleca.com>2011-01-03 13:45:01 +0100
committerDominik Kapusta <dominik.kapusta@teleca.com>2011-01-03 13:46:58 +0100
commit4b0babdafa675e3c43819865206e84b9e6cf837e (patch)
tree684f15618a942248a0c21ea8455b41c970dfb054
parent8e29665726512d45f740363e17cf40907cdfb183 (diff)
Changes: Fix updating status bar geometry X property from scene manager.
RevBy: MichaƂ Details: Amend status bar height before mapping it to the scene. This way it works correctly in portrait mode too.
-rw-r--r--src/corelib/scene/mscenemanager.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/corelib/scene/mscenemanager.cpp b/src/corelib/scene/mscenemanager.cpp
index cef6dbed..872c8d81 100644
--- a/src/corelib/scene/mscenemanager.cpp
+++ b/src/corelib/scene/mscenemanager.cpp
@@ -866,13 +866,14 @@ void MSceneManagerPrivate::updateStatusBarGeometryProperty()
long data[4] = {0};
if (statusBar) {
- QRectF statusBarGeometry = statusBar->mapRectToScene(
- QRectF(QPointF(), statusBar->geometry().size()));
-
- data[0] = statusBarGeometry.x();
- data[1] = statusBarGeometry.y();
- data[2] = statusBarGeometry.width();
- data[3] = statusBar->property("sharedPixmapHeight").value<qreal>();
+ QRectF statusBarGeometry = statusBar->geometry();
+ statusBarGeometry.setHeight(statusBar->property("sharedPixmapHeight").value<qreal>());
+
+ QRectF mappedStatusBarGeometry = statusBar->mapRectToScene(statusBarGeometry);
+ data[0] = mappedStatusBarGeometry.x();
+ data[1] = mappedStatusBarGeometry.y();
+ data[2] = mappedStatusBarGeometry.width();
+ data[3] = mappedStatusBarGeometry.height();
}
Display *dpy = QX11Info::display();