diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-10-04 13:11:30 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 22:23:30 +0200 |
commit | c66b7cf55b6913dcf33d49d4f6bf9db51ccf39a8 (patch) | |
tree | 430983856f993de5618aa5d8d0198b2db98eda97 /src/gui/kernel/qscreen.h | |
parent | 090d825e1d853a2ed875329a8350b0a727c3527e (diff) |
Added Orientation API to QScreen and QWindow.
QScreen now has a primary and current orientation, and a QWindow can set
its orientation as well. The current screen orientation is just a hint
to the application.
Change-Id: I4635982cfac2d16634d4edd5c6ab78e9d0ac55a4
Reviewed-on: http://codereview.qt-project.org/5988
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/kernel/qscreen.h')
-rw-r--r-- | src/gui/kernel/qscreen.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index 72681eb6da..2d075cfc5e 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.h @@ -48,6 +48,10 @@ #include <QtCore/QSize> #include <QtCore/QSizeF> +#include <QtGui/QTransform> + +#include <QtCore/qnamespace.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -93,10 +97,21 @@ public: QSize availableVirtualSize() const; QRect availableVirtualGeometry() const; + Qt::ScreenOrientation primaryOrientation() const; + Qt::ScreenOrientation currentOrientation() const; + + static int angleBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b); + static QTransform transformBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &target); + static QRect mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, const QRect &rect); + +Q_SIGNALS: + void currentOrientationChanged(Qt::ScreenOrientation orientation); + private: QScreen(QPlatformScreen *screen); Q_DISABLE_COPY(QScreen) + friend class QGuiApplicationPrivate; friend class QPlatformScreen; }; |