From bd16b1c894e8c911db443e12d59a76e73a61e19a Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sun, 1 Jan 2017 18:09:30 +0100 Subject: [PATCH 1/2] compositor: Reparent cursor surface item Cursor surface item should be on top of everything. --- compositor/qml/base/DesktopOutputWindow.qml | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/compositor/qml/base/DesktopOutputWindow.qml b/compositor/qml/base/DesktopOutputWindow.qml index be9e5bf00..1acc62b61 100644 --- 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 + } } From c69724e9e12dfae71d32c706d35b7f1ec920588b Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sun, 1 Jan 2017 18:11:27 +0100 Subject: [PATCH 2/2] compositor: Fix Drawer position --- compositor/qml/desktop/Shell.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/compositor/qml/desktop/Shell.qml b/compositor/qml/desktop/Shell.qml index 1b5ca601d..42efa5e16 100644 --- 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