summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-05-23 13:12:38 +0200
committerJohan Helsing <johan.helsing@qt.io>2016-05-31 15:13:03 +0000
commit80f6abcfc2105bd5f91cde03c0eeadf237d68032 (patch)
treef91a47eaf8ef5a8acfabdfb266c00d0f20d27efd /src
parent58bfe9d9b51786792d5b7af8a90698af87207ad1 (diff)
Compositor API: Add shell property to QWaylandWlShellSurface
Change-Id: I29467cc05ee79f7eb429bb5424879394a01bc242 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/extensions/qwaylandwlshell.cpp7
-rw-r--r--src/compositor/extensions/qwaylandwlshell.h3
2 files changed, 10 insertions, 0 deletions
diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp
index 4e9937680..90f591956 100644
--- a/src/compositor/extensions/qwaylandwlshell.cpp
+++ b/src/compositor/extensions/qwaylandwlshell.cpp
@@ -402,6 +402,7 @@ void QWaylandWlShellSurface::initialize(QWaylandWlShell *shell, QWaylandSurface
d->init(resource.resource());
setExtensionContainer(surface);
emit surfaceChanged();
+ emit shellChanged();
QWaylandCompositorExtension::initialize();
}
@@ -518,6 +519,12 @@ QWaylandSurface *QWaylandWlShellSurface::surface() const
return d->m_surface;
}
+QWaylandWlShell *QWaylandWlShellSurface::shell() const
+{
+ Q_D(const QWaylandWlShellSurface);
+ return d->m_shell;
+}
+
/*!
* \enum QWaylandWlShellSurface::FocusPolicy
*
diff --git a/src/compositor/extensions/qwaylandwlshell.h b/src/compositor/extensions/qwaylandwlshell.h
index 441c5452b..12c5e1ca2 100644
--- a/src/compositor/extensions/qwaylandwlshell.h
+++ b/src/compositor/extensions/qwaylandwlshell.h
@@ -77,6 +77,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandWlShellSurface : public QWaylandShellS
Q_OBJECT
Q_DECLARE_PRIVATE(QWaylandWlShellSurface)
Q_PROPERTY(QWaylandSurface *surface READ surface NOTIFY surfaceChanged)
+ Q_PROPERTY(QWaylandWlShell *shell READ shell NOTIFY shellChanged)
Q_PROPERTY(QString title READ title NOTIFY titleChanged)
Q_PROPERTY(QString className READ className NOTIFY classNameChanged)
Q_PROPERTY(FocusPolicy focusPolicy READ focusPolicy NOTIFY focusPolicyChanged)
@@ -118,6 +119,7 @@ public:
QString className() const;
QWaylandSurface *surface() const;
+ QWaylandWlShell *shell() const;
FocusPolicy focusPolicy() const;
@@ -138,6 +140,7 @@ public Q_SLOTS:
Q_SIGNALS:
void surfaceChanged();
+ void shellChanged();
void titleChanged();
void classNameChanged();
void focusPolicyChanged();