summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandquicksurface.h
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-07-29 14:32:59 +0200
committerJørgen Lind <jorgen.lind@theqtcompany.com>2015-08-28 13:09:41 +0200
commite94de5a53eddfcb880dc91507a7ab38b9f25f82b (patch)
tree51591c1642c7f18c7d764754b4e104838897ada6 /src/compositor/compositor_api/qwaylandquicksurface.h
parent57900c49362a7f9bf11a72a46e309f8beeb631bb (diff)
Add WaylandOutputWindow item
and add a convenience getter on the QWaylandQuickSurface to retrieve the window. This is because the window typically in qml will have additional properties which we want to retrieve. Instead of doing surface.output.window we can now do surface.outputWindow which looks cleaner Change-Id: Ia3007583a8a0e8e01444cb3f8819fbc651be14ab
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquicksurface.h')
-rw-r--r--src/compositor/compositor_api/qwaylandquicksurface.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h
index ed18de71e..0ab019d6c 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.h
+++ b/src/compositor/compositor_api/qwaylandquicksurface.h
@@ -57,6 +57,7 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickSurface : public QWaylandSurface
Q_PROPERTY(bool clientRenderingEnabled READ clientRenderingEnabled WRITE setClientRenderingEnabled NOTIFY clientRenderingEnabledChanged)
Q_PROPERTY(QObject *windowProperties READ windowPropertyMap CONSTANT)
Q_PROPERTY(QWaylandSurfaceItem *shellView READ shellView NOTIFY shellViewCreated)
+ Q_PROPERTY(QWindow *outputWindow READ outputWindow NOTIFY outputWindowChanged)
public:
QWaylandQuickSurface(wl_client *client, quint32 id, int version, QWaylandQuickCompositor *compositor);
~QWaylandQuickSurface();
@@ -75,10 +76,13 @@ public:
private:
bool event(QEvent *event) Q_DECL_OVERRIDE;
+ QWindow *outputWindow() const;
+
Q_SIGNALS:
void useTextureAlphaChanged();
void clientRenderingEnabledChanged();
void shellViewCreated();
+ void outputWindowChanged();
private:
void updateTexture();