diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-22 14:37:58 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-23 11:31:21 +0200 |
commit | 0bc19b49975bc82185aa24857f2a921584c9684f (patch) | |
tree | 7c4dbb914ebc0e40588d083171bba3de2fc65970 /src/gui/kernel/qwindow_p.h | |
parent | 294df24621ddd4e08ca792cd8e541dcc84409acb (diff) |
Implemented QWidget's move() vs setGeometry() distinction in QWindow.
QWidget's move() sets the position of the window including the window
frame, unlike setGeometry(). There was no equivalent for this in
QWindow, so several QWidget auto-tests were failing. Now we add
setFramePos() to achieve the same purpose in QWindow.
This fixes tst_QWidget::windowState(), which uses move().
Change-Id: I9a3e558bd615a8f0234cc3dd94fbb2bf5ecbc148
Reviewed-on: http://codereview.qt-project.org/5405
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/gui/kernel/qwindow_p.h')
-rw-r--r-- | src/gui/kernel/qwindow_p.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 8a3bc0d7fe..1ef8f59d33 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -43,6 +43,7 @@ #define QWINDOW_QPA_P_H #include <QtGui/qwindow.h> +#include <QtGui/qplatformwindow_qpa.h> #include <QtCore/private/qobject_p.h> @@ -59,6 +60,12 @@ class Q_GUI_EXPORT QWindowPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QWindow) public: + enum PositionPolicy + { + WindowFrameInclusive, + WindowFrameExclusive + }; + QWindowPrivate() : QObjectPrivate() , surfaceType(QWindow::RasterSurface) @@ -68,6 +75,7 @@ public: , visible(false) , windowState(Qt::WindowNoState) , resizeEventPending(true) + , positionPolicy(WindowFrameExclusive) , maximumSize(QWINDOWSIZE_MAX, QWINDOWSIZE_MAX) , modality(Qt::NonModal) , transientParent(0) @@ -101,6 +109,7 @@ public: QRect geometry; Qt::WindowState windowState; bool resizeEventPending; + PositionPolicy positionPolicy; QSize minimumSize; QSize maximumSize; |