diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-09-03 09:27:32 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-09-05 06:52:53 +0000 |
| commit | 27aca1beccbb0a7ab48df290d4b7bf016e38d253 (patch) | |
| tree | 10c05f32ac8d33b268d2689d10457e151633d2ef | |
| parent | e56cb62f4974c3318b763206e0216e0177a72ae8 (diff) | |
Compositor xdg-decoration: Make preferredMode's signal match the property
And the private variable. This was just an oversight when refactoring.
Change-Id: Iebe76ce3d4d192560f2e5b76e58463061c9c2dbb
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgdecorationv1.cpp | 10 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgdecorationv1.h | 4 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgdecorationv1_p.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp index a44d5c19d..3bf995a34 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp +++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp @@ -65,17 +65,17 @@ void QWaylandXdgDecorationManagerV1::initialize() QWaylandXdgToplevel::DecorationMode QWaylandXdgDecorationManagerV1::preferredMode() const { Q_D(const QWaylandXdgDecorationManagerV1); - return d->m_defaultMode; + return d->m_preferredMode; } -void QWaylandXdgDecorationManagerV1::setPreferredMode(QWaylandXdgToplevel::DecorationMode defaultMode) +void QWaylandXdgDecorationManagerV1::setPreferredMode(QWaylandXdgToplevel::DecorationMode preferredMode) { Q_D(QWaylandXdgDecorationManagerV1); - if (d->m_defaultMode == defaultMode) + if (d->m_preferredMode == preferredMode) return; - d->m_defaultMode = defaultMode; - emit defaultModeChanged(); + d->m_preferredMode = preferredMode; + emit preferredModeChanged(); } const wl_interface *QWaylandXdgDecorationManagerV1::interface() diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.h b/src/compositor/extensions/qwaylandxdgdecorationv1.h index 649f3d162..4390716e8 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1.h +++ b/src/compositor/extensions/qwaylandxdgdecorationv1.h @@ -48,7 +48,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgDecorationManagerV1 : public QWayla { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandXdgDecorationManagerV1) - Q_PROPERTY(QWaylandXdgToplevel::DecorationMode preferredMode READ preferredMode WRITE setPreferredMode NOTIFY defaultModeChanged) + Q_PROPERTY(QWaylandXdgToplevel::DecorationMode preferredMode READ preferredMode WRITE setPreferredMode NOTIFY preferredModeChanged) public: explicit QWaylandXdgDecorationManagerV1(); @@ -61,7 +61,7 @@ public: static const struct wl_interface *interface(); Q_SIGNALS: - void defaultModeChanged(); + void preferredModeChanged(); }; QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1_p.h b/src/compositor/extensions/qwaylandxdgdecorationv1_p.h index c09cbc12e..4c6c46334 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1_p.h +++ b/src/compositor/extensions/qwaylandxdgdecorationv1_p.h @@ -72,7 +72,7 @@ protected: void zxdg_decoration_manager_v1_get_toplevel_decoration(Resource *resource, uint id, ::wl_resource *toplevelResource) override; private: - DecorationMode m_defaultMode = DecorationMode::ClientSideDecoration; + DecorationMode m_preferredMode = DecorationMode::ClientSideDecoration; }; class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgToplevelDecorationV1 |