diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-19 13:18:03 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-19 13:18:04 +0200 |
commit | 9487f226cc6eba557ededf1d138de510cb2763e1 (patch) | |
tree | 760bc881aeed8f885038c5cfab517ade93d31d62 /src/client/qwaylandxdgshellv6_p.h | |
parent | 213429db416b60c6013624615206a6bf4c059d3f (diff) | |
parent | 3ffa7d5d6ecb75c244c6b22565df5184c638643a (diff) |
Merge remote-tracking branch 'origin/5.11.1' into 5.11
Change-Id: Idd23894d256f83518f2cd25d7c13f5a09c7d577e
Diffstat (limited to 'src/client/qwaylandxdgshellv6_p.h')
-rw-r--r-- | src/client/qwaylandxdgshellv6_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/client/qwaylandxdgshellv6_p.h b/src/client/qwaylandxdgshellv6_p.h index b72d3d18a..e6434c02f 100644 --- a/src/client/qwaylandxdgshellv6_p.h +++ b/src/client/qwaylandxdgshellv6_p.h @@ -115,9 +115,12 @@ private: ~Popup() override; void applyConfigure(); + void grab(QWaylandInputDevice *seat, uint serial); void zxdg_popup_v6_popup_done() override; QWaylandXdgSurfaceV6 *m_xdgSurface = nullptr; + QWaylandXdgSurfaceV6 *m_parent = nullptr; + bool m_grabbing = false; }; void setToplevel(); @@ -129,6 +132,8 @@ private: Popup *m_popup = nullptr; bool m_configured = false; QRegion m_exposeRegion; + + friend class QWaylandXdgShellV6; }; class Q_WAYLAND_CLIENT_EXPORT QWaylandXdgShellV6 : public QtWayland::zxdg_shell_v6 @@ -142,6 +147,9 @@ public: private: void zxdg_shell_v6_ping(uint32_t serial) override; + QWaylandXdgSurfaceV6::Popup *m_topmostPopup = nullptr; + + friend class QWaylandXdgSurfaceV6; }; QT_END_NAMESPACE |