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>

1 files changed, 12 insertions, 5 deletions

diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 4bb1ff77a5..7a075e624d 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -142,6 +142,12 @@ public:
     void setGeometry(const QRect &rect);
     QRect geometry() const;
 
+    QMargins frameMargins() const;
+    QRect frameGeometry() const;
+
+    QPoint framePos() const;
+    void setFramePos(const QPoint &point);
+
     inline int width() const { return geometry().width(); }
     inline int height() const { return geometry().height(); }
     inline int x() const { return geometry().x(); }
@@ -150,13 +156,14 @@ public:
     inline QSize size() const { return geometry().size(); }
     inline QPoint pos() const { return geometry().topLeft(); }
 
-    inline void move(const QPoint &pt) { setGeometry(QRect(pt, size())); }
-    inline void move(int posx, int posy) { move(QPoint(posx, posy)); }
+    QT_DEPRECATED inline void move(const QPoint &pt) { setPos(pt); }
+    QT_DEPRECATED inline void move(int posx, int posy) { setPos(posx, posy); }
 
-    inline void resize(const QSize &newsize) { setGeometry(QRect(pos(), newsize)); }
-    inline void resize(int w, int h) { setGeometry(QRect(x(), y(), w, h)); }
+    inline void setPos(const QPoint &pt) { setGeometry(QRect(pt, size())); }
+    inline void setPos(int posx, int posy) { setPos(QPoint(posx, posy)); }
 
-    QMargins frameMargins() const;
+    void resize(const QSize &newSize);
+    inline void resize(int w, int h) { setGeometry(QRect(x(), y(), w, h)); }
 
     void setWindowIcon(const QImage &icon) const;