summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wayland/democompositor/qml/Chrome.qml6
-rw-r--r--wayland/democompositor/qml/Screen.qml2
-rw-r--r--wayland/democompositor/qml/main.qml32
3 files changed, 8 insertions, 32 deletions
diff --git a/wayland/democompositor/qml/Chrome.qml b/wayland/democompositor/qml/Chrome.qml
index ea613fa..33a5b99 100644
--- a/wayland/democompositor/qml/Chrome.qml
+++ b/wayland/democompositor/qml/Chrome.qml
@@ -106,7 +106,7 @@ Rectangle {
}
]
- WaylandQuickItem {
+ ShellSurfaceItem {
id: surfaceItem
anchors.fill: parent
@@ -116,13 +116,11 @@ Rectangle {
property bool dead: false
property bool valid: false
property bool explicitlyHidden: false
- property var shellSurface: ShellSurface {
- }
sizeFollowsSurface: false
onSurfaceDestroyed: {
- view.bufferLock = true;
+ bufferLocked = true;
x = 0
y = 0
rootChrome.destroyAnimation.start();
diff --git a/wayland/democompositor/qml/Screen.qml b/wayland/democompositor/qml/Screen.qml
index 84c433e..34fd090 100644
--- a/wayland/democompositor/qml/Screen.qml
+++ b/wayland/democompositor/qml/Screen.qml
@@ -318,7 +318,7 @@ WaylandOutput {
anchors.left: sidebar.right
anchors.right: parent.right
anchors.bottom: parent.bottom
- enableWSCursor: false
+ windowSystemCursorEnabled: false
Rectangle {
id: background
anchors.fill: parent
diff --git a/wayland/democompositor/qml/main.qml b/wayland/democompositor/qml/main.qml
index 8104db6..8c0c621 100644
--- a/wayland/democompositor/qml/main.qml
+++ b/wayland/democompositor/qml/main.qml
@@ -66,33 +66,11 @@ WaylandCompositor {
}
}
- Component {
- id: surfaceComponent
- WaylandSurface {
+ WlShell {
+ id: defaultShell
+ onWlShellSurfaceCreated: {
+ chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
+ defaultOutput.relayout();
}
}
-
- extensions: [
- Shell {
- id: defaultShell
-
-
- onCreateShellSurface: {
- var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
- item.shellSurface.initialize(defaultShell, surface, client, id);
- }
-
- Component.onCompleted: {
- initialize();
- }
- }
- ]
-
- onCreateSurface: {
- var surface = surfaceComponent.createObject(comp, { } );
- surface.initialize(comp, client, id, version);
- }
- onSurfaceCreated: {
- defaultOutput.relayout()
- }
}