diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-27 12:29:52 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
commit | c45c1e13c95426116b2b9cc945939bb0b9598079 (patch) | |
tree | ac0b71232e0899b757affa82c19f0086e2ef5098 /src/compositor/extensions/qwaylandshell.h | |
parent | c9500b6eff3dc8fbcc6e9fc569b2e246541a2a05 (diff) |
Make it possible to create the shell surface from qml
Change-Id: I83dceff36d1027b24c1dafb3bc44e07f7502bc54
Diffstat (limited to 'src/compositor/extensions/qwaylandshell.h')
-rw-r--r-- | src/compositor/extensions/qwaylandshell.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h index a44c08030..0cd510065 100644 --- a/src/compositor/extensions/qwaylandshell.h +++ b/src/compositor/extensions/qwaylandshell.h @@ -44,6 +44,7 @@ class QWaylandShellSurfacePrivate; class QWaylandSurface; class QWaylandView; class QWaylandShellPrivate; +class QWaylandClient; class Q_COMPOSITOR_EXPORT QWaylandShell : public QWaylandExtensionTemplate<QWaylandShell> { @@ -59,7 +60,7 @@ public: static QByteArray interfaceName(); Q_SIGNALS: - void shellSurfaceCreated(QWaylandSurface *surface, QWaylandShellSurface *shellSurface); + void createShellSurface(QWaylandSurface *surface, QWaylandClient *client, uint id); }; class Q_COMPOSITOR_EXPORT QWaylandShellSurface : public QWaylandExtensionTemplate<QWaylandShellSurface> @@ -81,7 +82,10 @@ public: Popup }; - QWaylandShellSurface(QWaylandShell *shell, struct wl_client *client, uint32_t id, QWaylandSurface *surface); + QWaylandShellSurface(); + QWaylandShellSurface(QWaylandShell *shell, QWaylandSurface *surface, QWaylandView *view, QWaylandClient *client, uint id); + + Q_INVOKABLE void initialize(QWaylandShell *shell, QWaylandSurface *surface, QWaylandView *view, QWaylandClient *client, uint id); SurfaceType surfaceType() const; @@ -111,6 +115,8 @@ Q_SIGNALS: private Q_SLOTS: void mappedChanged(); void adjustOffset(const QPoint &p); +private: + void initialize(); }; #endif /*QWAYLANDSHELL_H*/ |