fix: fix magnifying glass on multi outputs

sync from waylib 0574fff261b06bdf80fc18639b38a1343ba23ee1 Log:
linuxdeepin · Jan 9, 2024 · bb5ddb4 · bb5ddb4
1 parent 5953f34
commit bb5ddb4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/treeland/quick/qml/Main.qml b/src/treeland/quick/qml/Main.qml
@@ -51,7 +51,8 @@ Item {
             id: backend
 
             onOutputAdded: function(output) {
-                output.forceSoftwareCursor = true // Test
+                if (!backend.hasDrm)
+                    output.forceSoftwareCursor = true // Test
 
                 TreeLandHelper.allowNonDrmOutputAutoChangeMode(output)
                 QmlHelper.outputManager.add({waylandOutput: output})

diff --git a/src/treeland/quick/qml/OutputDelegate.qml b/src/treeland/quick/qml/OutputDelegate.qml
@@ -100,12 +100,14 @@ OutputItem {
         OutputViewport {
             readonly property OutputItem outputItem: waylandOutput.OutputItem.item
 
+            id: viewport
             root: true
             output: waylandOutput
             devicePixelRatio: outputViewport.devicePixelRatio
 
             TextureProxy {
                 sourceItem: outputViewport
+                anchors.fill: parent
             }
 
             Item {
@@ -135,6 +137,8 @@ OutputItem {
                             smooth: false
                             scale: 10
                             transformOrigin: Item.TopLeft
+                            width: viewport.width
+                            height: viewport.height
 
                             function updatePosition() {
                                 const pos = outputItem.lastActiveCursorItem.mapToItem(outputViewport, Qt.point(0, 0))