diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-18 12:41:52 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-18 14:56:24 +0000 |
| commit | e32a289798a1b16e3d0858217003dcc2864cc0c1 (patch) | |
| tree | fcee5fc9d00c7f457196fd1bdd26e1c87953f456 /src/compositor/compositor_api/qwaylandquickitem.h | |
| parent | c73103268debe47f8b51fe08d69e00a6d7d109f9 (diff) | |
Add sizeFollowsSurface property to QWaylandQuickItem
Change-Id: I416f5689679d08b9ba89dceceac5c2ed9128ed9a
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 5bdd30566..813224514 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -64,9 +64,9 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem Q_PROPERTY(bool paintEnabled READ paintEnabled WRITE setPaintEnabled) Q_PROPERTY(bool touchEventsEnabled READ touchEventsEnabled WRITE setTouchEventsEnabled NOTIFY touchEventsEnabledChanged) Q_PROPERTY(QWaylandSurface::Origin origin READ origin NOTIFY originChanged) - Q_PROPERTY(bool resizeSurfaceToItem READ resizeSurfaceToItem WRITE setResizeSurfaceToItem NOTIFY resizeSurfaceToItemChanged) Q_PROPERTY(bool inputEventsEnabled READ inputEventsEnabled WRITE setInputEventsEnabled NOTIFY inputEventsEnabledChanged) Q_PROPERTY(bool focusOnClick READ focusOnClick WRITE setFocusOnClick NOTIFY focusOnClickChanged) + Q_PROPERTY(bool sizeFollowsSurface READ sizeFollowsSurface WRITE setSizeFollowsSurface NOTIFY sizeFollowsSurfaceChanged) public: QWaylandQuickItem(QQuickItem *parent = 0); @@ -85,10 +85,8 @@ public: bool paintEnabled() const; bool touchEventsEnabled() const; - bool resizeSurfaceToItem() const; void setTouchEventsEnabled(bool enabled); - void setResizeSurfaceToItem(bool enabled); bool inputEventsEnabled() const; void setInputEventsEnabled(bool enabled); @@ -97,6 +95,10 @@ public: void setFocusOnClick(bool focus); bool inputRegionContains(QPointF localPosition); + + bool sizeFollowsSurface() const; + void setSizeFollowsSurface(bool sizeFollowsSurface); + protected: void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); @@ -130,12 +132,12 @@ Q_SIGNALS: void surfaceChanged(); void touchEventsEnabledChanged(); void originChanged(); - void resizeSurfaceToItemChanged(); void surfaceDestroyed(); void inputEventsEnabledChanged(); void focusOnClickChanged(); void mouseMove(const QPointF &windowPosition); void mouseRelease(); + void sizeFollowsSurfaceChanged(); protected: QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); |