diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-17 16:08:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 20:09:58 +0100 |
| commit | 400c865f2994e67189108e36cfa206c365d57274 (patch) | |
| tree | 569d3bcb82ba4b7378aedf3a19a276c916c497b2 /src/plugins/platforms/windows/qwindowswindow.h | |
| parent | 3ca194eb129c227b81bf1f04bfb879c404dc9f89 (diff) | |
Windows: Fix QWindow-test.
- Save & Restore style and geometry when switching to
full screen and back since it is not a real state on
Windows.
- Obey the positioning policy in setGeometry.
Task-number: QTBUG-24185
Change-Id: I18dea4fd372e0b2e46273a7a27e0c6f4f4bde771
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 1d5f3c29d6..e3336d1c3a 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -193,6 +193,7 @@ private: inline void show_sys() const; inline void hide_sys() const; inline void setGeometry_sys(const QRect &rect) const; + inline QRect frameGeometry_sys() const; inline QRect geometry_sys() const; inline WindowData setWindowFlags_sys(Qt::WindowFlags wt, unsigned flags = 0) const; inline void setWindowState_sys(Qt::WindowState newState); @@ -213,6 +214,8 @@ private: bool m_mouseGrab; QWindowsWindowCursor m_cursor; QWindowsOleDropTarget *m_dropTarget; + unsigned m_savedStyle; + QRect m_savedFrameGeometry; }; // Conveniences for window frames. |