diff options
| author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-03-31 17:18:43 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-29 11:17:45 +0200 |
| commit | bb37532f36862eb29e033508d1c6c5dbc8c2be13 (patch) | |
| tree | fa9d2e8300bf07f07e2c49b35e1bb936fbe8bc90 /src/compositor/compositor_api/qwaylanddrag.cpp | |
| parent | 96ab8abe0b0faea7f63f0477025fe0649e410362 (diff) | |
Split QWaylandSurface in a model and view fashion
QtQuick compositors already use a view class (QWaylandSurfaceItem),
so add a new QWaylandSurfaceView, which is subclassed by
QWaylandSurfaceItem, and move the view related methods of QWaylandSurface
there. A QWaylandSurface can have many views.
Change-Id: I7e92fe1f7e9d252f5f40a3097feabb5f3318b03a
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylanddrag.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylanddrag.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp index def763929..8916b0d71 100644 --- a/src/compositor/compositor_api/qwaylanddrag.cpp +++ b/src/compositor/compositor_api/qwaylanddrag.cpp @@ -46,6 +46,7 @@ #include "qwlinputdevice_p.h" #include "qwldatadevice_p.h" #include "qwlsurface_p.h" +#include "qwaylandsurfaceview.h" QT_BEGIN_NAMESPACE @@ -66,7 +67,7 @@ QWaylandDrag::QWaylandDrag(QtWayland::InputDevice *inputDevice) { } -QWaylandSurface *QWaylandDrag::icon() const +QWaylandSurfaceView *QWaylandDrag::icon() const { Q_D(const QWaylandDrag); @@ -74,7 +75,7 @@ QWaylandSurface *QWaylandDrag::icon() const if (!dataDevice) return 0; - return dataDevice->dragIcon() ? dataDevice->dragIcon()->waylandSurface() : 0; + return dataDevice->dragIcon(); } bool QWaylandDrag::visible() const |