From b39df8bf92a530783144dbcf5cae939742ff2d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Fri, 13 Jan 2012 10:31:11 +0100 Subject: Made window orientation API more flexible. Previously we only had QWindow::setOrientation() which was a hint about the orientation the window's contents were rendered in. However, it's necessary to separate between the orientation corresponding to the window buffer layout and orientation of the contents. A game for example might typically want to use a landscape buffer even on a portrait device. Thus, we replace QWindow::orientation() with QWindow::reportContentOrientationChange() and QWindow::requestWindowOrientation(). Change-Id: I1f07362192daf36c45519cb05b43ac352f1945b5 Reviewed-by: Lars Knoll --- src/gui/kernel/qscreen_p.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/gui/kernel/qscreen_p.h') diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index 545534df29..2fdf12dd90 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/src/gui/kernel/qscreen_p.h @@ -59,13 +59,18 @@ public: QScreenPrivate(QPlatformScreen *screen) : platformScreen(screen) { - currentOrientation = screen->currentOrientation(); + orientation = screen->orientation(); geometry = screen->geometry(); availableGeometry = screen->availableGeometry(); logicalDpi = screen->logicalDpi(); + + updatePrimaryOrientation(); } - Qt::ScreenOrientation currentOrientation; + void updatePrimaryOrientation(); + + Qt::ScreenOrientation orientation; + Qt::ScreenOrientation primaryOrientation; QRect geometry; QRect availableGeometry; QDpi logicalDpi; -- cgit v1.2.3