Merge branch 'release/0.9.0' of github.com:lirios/shell into release/…

…0.9.0
lirios · Jan 10, 2017 · 1bfb212 · 1bfb212
2 parents 192a8ef + c69724e
commit 1bfb212
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/compositor/qml/base/DesktopOutputWindow.qml b/compositor/qml/base/DesktopOutputWindow.qml
@@ -106,21 +106,6 @@ ApplicationWindow {
             anchors.fill: parent
         }
 
-        // Pointer cursor
-        GreenIsland.WaylandCursorItem {
-            id: cursor
-
-            seat: output.compositor.defaultSeat
-
-            x: mouseTracker.mouseX
-            y: mouseTracker.mouseY
-            z: 1000001
-
-            visible: mouseTracker.containsMouse &&
-                     screenView.cursorVisible &&
-                     output.powerState === GreenIsland.ExtendedOutput.PowerStateOn
-        }
-
         // Idle dimmer
         IdleDimmer {
             id: idleDimmer
@@ -132,4 +117,19 @@ ApplicationWindow {
             z: 1000002
         }
     }
+
+    // Pointer cursor
+    GreenIsland.WaylandCursorItem {
+        id: cursor
+
+        seat: output.compositor.defaultSeat
+
+        x: mouseTracker.mouseX
+        y: mouseTracker.mouseY
+        z: 1000001
+
+        visible: mouseTracker.containsMouse &&
+                 screenView.cursorVisible &&
+                 output.powerState === GreenIsland.ExtendedOutput.PowerStateOn
+    }
 }
diff --git a/compositor/qml/desktop/Shell.qml b/compositor/qml/desktop/Shell.qml
@@ -63,7 +63,6 @@ Item {
 
         edge: Qt.RightEdge
 
-        y: screenView.width
         width: Math.max(320, panel.rightWidth)
         height: screenView.height