summaryrefslogtreecommitdiffstats
path: root/src/compositor/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'src/compositor/extensions')
-rw-r--r--src/compositor/extensions/qwaylandxdgdecorationv1.cpp10
-rw-r--r--src/compositor/extensions/qwaylandxdgdecorationv1.h4
-rw-r--r--src/compositor/extensions/qwaylandxdgdecorationv1_p.h2
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