summaryrefslogtreecommitdiffstats
path: root/examples/wayland/custom-extension/compositor/qml
diff options
context:
space:
mode:
Diffstat (limited to 'examples/wayland/custom-extension/compositor/qml')
-rw-r--r--examples/wayland/custom-extension/compositor/qml/Screen.qml8
-rw-r--r--examples/wayland/custom-extension/compositor/qml/main.qml28
2 files changed, 16 insertions, 20 deletions
diff --git a/examples/wayland/custom-extension/compositor/qml/Screen.qml b/examples/wayland/custom-extension/compositor/qml/Screen.qml
index 3173c7a08..b6e4e12d0 100644
--- a/examples/wayland/custom-extension/compositor/qml/Screen.qml
+++ b/examples/wayland/custom-extension/compositor/qml/Screen.qml
@@ -58,7 +58,7 @@ WaylandOutput {
id: mouseTracker
anchors.fill: parent
- enableWSCursor: true
+ windowSystemCursorEnabled: true
Image {
id: background
anchors.fill: parent
@@ -69,10 +69,10 @@ WaylandOutput {
WaylandCursorItem {
id: cursor
inputEventsEnabled: false
- x: mouseTracker.mouseX - hotspotX
- y: mouseTracker.mouseY - hotspotY
+ x: mouseTracker.mouseX
+ y: mouseTracker.mouseY
- inputDevice: output.compositor.defaultInputDevice
+ seat: output.compositor.defaultSeat
}
Rectangle {
anchors.bottom: parent.bottom
diff --git a/examples/wayland/custom-extension/compositor/qml/main.qml b/examples/wayland/custom-extension/compositor/qml/main.qml
index 097bfe30b..a7ca56e03 100644
--- a/examples/wayland/custom-extension/compositor/qml/main.qml
+++ b/examples/wayland/custom-extension/compositor/qml/main.qml
@@ -74,22 +74,18 @@ WaylandCompositor {
}
}
- extensions: [
- WlShell {
- id: defaultShell
-
- onShellSurfaceCreated: {
- var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
- lastItem = item;
- }
- },
- CustomExtension {
- id: custom
- onRequestReceived: {
- console.log("Compositor received a request: \"" + text + "\", " + value)
- }
+ WlShell {
+ id: defaultShell
+ onWlShellSurfaceCreated: {
+ var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
+ lastItem = item;
}
+ }
- ]
-
+ CustomExtension {
+ id: custom
+ onRequestReceived: {
+ console.log("Compositor received a request: \"" + text + "\", " + value)
+ }
+ }
}