diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-06 13:41:27 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:32 +0200 |
commit | fd9a8983832bbeb240097327ff9f8565f7356b08 (patch) | |
tree | db359b31c502694b3c33e451825fda7257c31bc1 /src/compositor/compositor_api/qwaylandquickitem.cpp | |
parent | e6a44555c60859fd61a6cc78140a36fa36e7b9f5 (diff) |
Fixups after rebasing
Change-Id: Ie5d8899157d77f83f2cf65f236d534b972aa4770
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index ef62257ad..4e357dea2 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -239,6 +239,7 @@ void QWaylandQuickItem::hoverMoveEvent(QHoverEvent *event) event->ignore(); return; } + } if (shouldSendInputEvents()) { QWaylandInputDevice *inputDevice = compositor()->inputDeviceFor(event); inputDevice->sendMouseMoveEvent(this, event->pos()); @@ -335,16 +336,14 @@ void QWaylandQuickItem::waylandSurfaceChanged(QWaylandSurface *newSurface, QWayl { QWaylandView::waylandSurfaceChanged(newSurface, oldSurface); if (oldSurface) { - disconnect(oldSurface, &QWaylandSurface::mapped, this, &QWaylandQuickItem::surfaceMapped); - disconnect(oldSurface, &QWaylandSurface::unmapped, this, &QWaylandQuickItem::surfaceUnmapped); + disconnect(oldSurface, &QWaylandSurface::mappedChanged, this, &QWaylandQuickItem::surfaceMappedChanged); disconnect(oldSurface, &QWaylandSurface::parentChanged, this, &QWaylandQuickItem::parentChanged); disconnect(oldSurface, &QWaylandSurface::sizeChanged, this, &QWaylandQuickItem::updateSize); disconnect(oldSurface, &QWaylandSurface::configure, this, &QWaylandQuickItem::updateBuffer); disconnect(oldSurface, &QWaylandSurface::redraw, this, &QQuickItem::update); } if (newSurface) { - connect(newSurface, &QWaylandSurface::mapped, this, &QWaylandQuickItem::surfaceMapped); - connect(newSurface, &QWaylandSurface::unmapped, this, &QWaylandQuickItem::surfaceUnmapped); + connect(newSurface, &QWaylandSurface::mappedChanged, this, &QWaylandQuickItem::surfaceMappedChanged); connect(newSurface, &QWaylandSurface::parentChanged, this, &QWaylandQuickItem::parentChanged); connect(newSurface, &QWaylandSurface::sizeChanged, this, &QWaylandQuickItem::updateSize); connect(newSurface, &QWaylandSurface::configure, this, &QWaylandQuickItem::updateBuffer); @@ -379,12 +378,7 @@ void QWaylandQuickItem::takeFocus(QWaylandInputDevice *device) target->setKeyboardFocus(surface()); } -void QWaylandQuickItem::surfaceMapped() -{ - update(); -} - -void QWaylandQuickItem::surfaceUnmapped() +void QWaylandQuickItem::surfaceMappedChanged() { update(); } |