Merge pull request #24875 from cbjeukendrup/simplify_focusable_control

cbjeukendrup · web-flow · commit 4bf3929ec86c · 2024-09-30T00:06:36.000+02:00
Simplify FocusableControl.qml by removing unnecessary content wrapper
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/FocusableControl.qml b/src/framework/uicomponents/qml/Muse/UiComponents/FocusableControl.qml
@@ -25,8 +25,6 @@ import Muse.Ui 1.0
 FocusScope {
     id: root
 
-    default property alias content: contentItemContainer.data
-    property alias contentItem: contentItemContainer
     property alias background: focusRectItem
     property alias focusBorder: focusBorderItem
 
@@ -92,10 +90,4 @@ FocusScope {
             root.ensureActiveFocus()
         }
     }
-
-    Item {
-        id: contentItemContainer
-        objectName: "FocusableControlContent"
-        anchors.fill: focusRectItem
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ import Muse.Ui 1.0`
`25`	`25`	`FocusScope {`
`26`	`26`	`id: root`
`27`	`27`
`28`		`- default property alias content: contentItemContainer.data`
`29`		`- property alias contentItem: contentItemContainer`
`30`	`28`	`property alias background: focusRectItem`
`31`	`29`	`property alias focusBorder: focusBorderItem`
`32`	`30`
`@@ -92,10 +90,4 @@ FocusScope {`
`92`	`90`	`root.ensureActiveFocus()`
`93`	`91`	`}`
`94`	`92`	`}`
`95`		`-`
`96`		`- Item {`
`97`		`- id: contentItemContainer`
`98`		`- objectName: "FocusableControlContent"`
`99`		`- anchors.fill: focusRectItem`
`100`		`- }`
`101`	`93`	`}`