diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-09-04 10:33:27 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-09-05 11:22:56 +0000 |
| commit | 5e429553f6a192745c4fcd98ae5cf2be4c6cb082 (patch) | |
| tree | e8ae126bc9a4bf5ca43530d40d4427cf9766626c | |
| parent | db2dc465606f455718200641974493b499876dbd (diff) | |
Compositor: Remove XdgToplevel.DefaultDecorationMode
It can't be set or read through public API.
Change-Id: Ieebec0d8678a023ea39b3964f92716eda3a51ac0
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgdecorationv1.cpp | 8 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgdecorationv1_p.h | 6 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshell.h | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp index 6ece73b8e..fb045d245 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp +++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp @@ -235,23 +235,23 @@ void QWaylandXdgToplevelDecorationV1::zxdg_toplevel_decoration_v1_destroy(Resour void QWaylandXdgToplevelDecorationV1::zxdg_toplevel_decoration_v1_set_mode(Resource *resource, uint32_t mode) { - m_clientPreferredMode = DecorationMode(mode); + m_clientPreferredMode = mode; handleClientPreferredModeChanged(); } void QWaylandXdgToplevelDecorationV1::zxdg_toplevel_decoration_v1_unset_mode(Resource *resource) { - m_clientPreferredMode = DecorationMode::DefaultDecorationMode; + m_clientPreferredMode = 0; handleClientPreferredModeChanged(); } void QWaylandXdgToplevelDecorationV1::handleClientPreferredModeChanged() { if (m_clientPreferredMode != m_configuredMode) { - if (m_clientPreferredMode == DecorationMode::DefaultDecorationMode) + if (m_clientPreferredMode == 0) sendConfigure(m_manager->preferredMode()); else - sendConfigure(m_clientPreferredMode); + sendConfigure(DecorationMode(m_clientPreferredMode)); } } diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1_p.h b/src/compositor/extensions/qwaylandxdgdecorationv1_p.h index 3d181a919..fdd555abb 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1_p.h +++ b/src/compositor/extensions/qwaylandxdgdecorationv1_p.h @@ -85,7 +85,7 @@ public: wl_client *client, int id); ~QWaylandXdgToplevelDecorationV1() override; - DecorationMode configuredMode() const { return m_configuredMode; } + DecorationMode configuredMode() const { return DecorationMode(m_configuredMode); } void sendConfigure(DecorationMode mode); protected: @@ -99,8 +99,8 @@ private: QWaylandXdgToplevel *m_toplevel = nullptr; QWaylandXdgDecorationManagerV1 *m_manager = nullptr; - DecorationMode m_configuredMode = DecorationMode::DefaultDecorationMode; - DecorationMode m_clientPreferredMode = DecorationMode::DefaultDecorationMode; + uint m_configuredMode = 0; + uint m_clientPreferredMode = 0; }; QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h index aec6193a7..71454f929 100644 --- a/src/compositor/extensions/qwaylandxdgshell.h +++ b/src/compositor/extensions/qwaylandxdgshell.h @@ -163,9 +163,8 @@ public: Q_ENUM(State) enum DecorationMode { - DefaultDecorationMode, - ClientSideDecoration, - ServerSideDecoration, + ClientSideDecoration = 1, + ServerSideDecoration = 2, }; Q_ENUM(DecorationMode) |