diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 12:05:12 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:41 +0200 |
| commit | ab6980d57609b1e4bdb164d3413faa2f7cb7e1e4 (patch) | |
| tree | ef68f66511347c0545559df6a81b6d56c6448eb4 /src/compositor/compositor_api/qwaylandquicksurface.h | |
| parent | e88c2f37097901e228de70c62a0220386038a51a (diff) | |
Move the output from QWaylandSurface to the QWaylandSurfaceView
and add a property called primaryOutput on the QWaylandSurface.
Also add some bookkeeping in QtWayland::Output so it knows what surfaces
and views it currently holds, sending the enter and leave events
automatically.
Change-Id: Ib6efbc6f8157657fb4451b751bba1cb5345b7906
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquicksurface.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquicksurface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h index 3f262a402..7e079471d 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.h +++ b/src/compositor/compositor_api/qwaylandquicksurface.h @@ -55,7 +55,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) + Q_PROPERTY(QWindow *primaryOutputWindow READ primaryOutputWindow NOTIFY primaryOutputWindowChanged) public: QWaylandQuickSurface(wl_client *client, quint32 id, int version, QWaylandQuickCompositor *compositor); ~QWaylandQuickSurface(); @@ -72,13 +72,13 @@ public: private: bool event(QEvent *event) Q_DECL_OVERRIDE; - QWindow *outputWindow() const; + QWindow *primaryOutputWindow() const; Q_SIGNALS: void useTextureAlphaChanged(); void clientRenderingEnabledChanged(); void shellViewCreated(); - void outputWindowChanged(); + void primaryOutputWindowChanged(); }; QT_END_NAMESPACE |