Fixups after rebasing

Change-Id: Ie5d8899157d77f83f2cf65f236d534b972aa4770

2 files changed, 16 insertions, 10 deletions

diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
index 0f8462211..bb8d3463a 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
@@ -179,9 +179,16 @@ void QWindowCompositor::surfaceDestroyed()
     m_renderScheduler.start(0);
 }
 
-void QWindowCompositor::surfaceMapped()
+void QWindowCompositor::surfaceMappedChanged()
 {
     QWaylandSurface *surface = qobject_cast<QWaylandSurface *>(sender());
+    if (surface->isMapped())
+        surfaceMapped(surface);
+    else
+        surfaceUnmapped(surface);
+}
+void QWindowCompositor::surfaceMapped(QWaylandSurface *surface)
+{
     QtWayland::ShellSurface *shellSurface = QtWayland::ShellSurface::findIn(surface);
     QPoint pos;
     if (!m_surfaces.contains(surface)) {
@@ -206,16 +213,15 @@ void QWindowCompositor::surfaceMapped()
     }
 
     m_surfaces.append(surface);
-    defaultInputDevice()->setKeyboardFocus(surface);
+    if (!surface->isCursorSurface())
+        defaultInputDevice()->setKeyboardFocus(surface);
 
     m_renderScheduler.start(0);
 }
 
-void QWindowCompositor::surfaceUnmapped()
+void QWindowCompositor::surfaceUnmapped(QWaylandSurface *surface)
 {
-    QWaylandSurface *surface = qobject_cast<QWaylandSurface *>(sender());
-    if (m_surfaces.removeOne(surface))
-        m_surfaces.insert(0, surface);
+    m_surfaces.removeOne(surface);
 
     ensureKeyboardFocusSurface(surface);
     m_renderScheduler.start(0);
@@ -241,8 +247,7 @@ void QWindowCompositor::surfaceCommitted(QWaylandSurface *surface)
 void QWindowCompositor::onSurfaceCreated(QWaylandSurface *surface)
 {
     connect(surface, SIGNAL(surfaceDestroyed()), this, SLOT(surfaceDestroyed()));
-    connect(surface, SIGNAL(mapped()), this, SLOT(surfaceMapped()));
-    connect(surface, SIGNAL(unmapped()), this, SLOT(surfaceUnmapped()));
+    connect(surface, SIGNAL(mappedChanged()), this, SLOT(surfaceMappedChanged()));
     connect(surface, SIGNAL(redraw()), this, SLOT(surfaceCommitted()));
     connect(surface, SIGNAL(extendedSurfaceReady()), this, SLOT(sendExpose()));
 }
diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.h b/examples/wayland/qwindow-compositor/qwindowcompositor.h
index 7534b57b0..2ac302f2f 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.h
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.h
@@ -70,9 +70,8 @@ public:
 
     void create() Q_DECL_OVERRIDE;
 private slots:
+    void surfaceMappedChanged();
     void surfaceDestroyed();
-    void surfaceMapped();
-    void surfaceUnmapped();
     void surfaceCommitted();
     void surfacePosChanged();
 
@@ -98,6 +97,8 @@ private slots:
     void updateCursor(bool hasBuffer);
 
 private:
+    void surfaceMapped(QWaylandSurface *surface);
+    void surfaceUnmapped(QWaylandSurface *surface);
     void drawSubSurface(const QPoint &offset, QWaylandSurface *surface);
 
     CompositorWindow *m_window;