diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-14 12:35:52 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-14 12:17:05 +0000 |
| commit | f5f06c709937b657c66ca4e35f4e3065ba390153 (patch) | |
| tree | 1019883bf566cc7de6d86b9cd2ab4f43b342b26c /src/compositor/compositor_api/qwaylandquickitem.h | |
| parent | 2deffa537c82e2f21e01dff5c8f5ba283dd06032 (diff) | |
Remove global coordinates
This involves removing:
- pickView and mapView from QWaylandOutput
- requestedPos[X,Y] from QWaylandView
Change-Id: Ie53eef434ac6ae7d0d5474f649f78a59ae857167
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 10355df2d..57dd91f0a 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -67,6 +67,7 @@ class Q_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem 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(QPointF mousePressPosition READ mousePressPosition) public: QWaylandQuickItem(QQuickItem *parent = 0); @@ -98,6 +99,8 @@ public: bool focusOnClick() const; void setFocusOnClick(bool focus); + QPointF mousePressPosition() const; + protected: void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); @@ -134,6 +137,8 @@ Q_SIGNALS: void surfaceDestroyed(); void inputEventsEnabledChanged(); void focusOnClickChanged(); + void mouseMove(const QPointF &windowPosition); + void mouseRelease(); protected: QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); @@ -157,6 +162,7 @@ private: QQuickWindow *m_connectedWindow; QWaylandSurface::Origin m_origin; + QPointF m_mousePressPosition; }; QT_END_NAMESPACE |