diff options
author | Matt Hoosier <matt.hoosier@garmin.com> | 2013-05-16 11:02:37 -0500 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-23 20:01:40 +0200 |
commit | c1ca272f04465b58a7b1720df3b03c6573de8851 (patch) | |
tree | bb9d85d5e3feeb7acaa9894a8144f488ed47c485 /src/plugins/platforms/qnx/qqnxscreen.h | |
parent | 77a06e7e6c517003585ba53b9776e90c8d290e84 (diff) | |
download | qtbase-c1ca272f04465b58a7b1720df3b03c6573de8851.tar.gz |
QNX: support underlain foreign windows
Previously, any foreign window was treated as an overlay, with its
z-order being forcibly set above the native Qt windows.
This change adjusts the strategy to treat foreign windows whose initial
z-order is less than -1 (the default z-order used by mmrender for its
overlay surfaces) as underlays; otherwise the foreign window is treated
as an overlay.
Change-Id: Ifbcfd3a956965fa1a347076e9845afa50a81edfd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxscreen.h')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxscreen.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h index 98f2a90fbc..6e8c2c6a60 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.h +++ b/src/plugins/platforms/qnx/qqnxscreen.h @@ -114,7 +114,8 @@ private: void resizeTopLevelWindow(QQnxWindow *w, const QRect &previousScreenGeometry) const; void resizeWindows(const QRect &previousScreenGeometry); void addOverlayWindow(screen_window_t window); - void removeOverlayWindow(screen_window_t window); + void addUnderlayWindow(screen_window_t window); + void removeOverlayOrUnderlayWindow(screen_window_t window); QWindow *topMostChildWindow() const; @@ -136,6 +137,7 @@ private: QList<QQnxWindow *> m_childWindows; QList<screen_window_t> m_overlays; + QList<screen_window_t> m_underlays; QPlatformCursor *m_cursor; }; |