qml: avoid directly referencing root control's content item

Sanjukademani · Dec 18, 2022 · dec5d4b · dec5d4b
1 parent eecd601
commit dec5d4b
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 25 deletions.
diff --git a/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml b/modules/gui/qt/dialogs/dialogs/qml/CustomDialog.qml
@@ -26,7 +26,7 @@ import "qrc:///widgets/" as Widgets
 ModalDialog {
     id: root
 
-    property alias text: content.text
+    property string text
 
     property alias cancelTxt: cancelBtn.text
     property alias okTxt: okBtn.text
@@ -65,11 +65,11 @@ ModalDialog {
     }
 
     contentItem: Text {
-        id: content
         focus: false
         font.pixelSize: VLCStyle.fontSize_normal
         color: VLCStyle.colors.text
         wrapMode: Text.WordWrap
+        text: root.text
     }
 
     footer: FocusScope {

diff --git a/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml b/modules/gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml
@@ -140,15 +140,13 @@ Control {
     }
 
     contentItem: Item {
-        id: wrapper
-
         implicitHeight: loader.implicitHeight
         implicitWidth: loader.implicitWidth
 
         Loader {
             id: loader
 
-            parent: Drag.active ? root : wrapper
+            parent: Drag.active ? root : control.contentItem
 
             anchors.horizontalCenter: Drag.active ? undefined : parent.horizontalCenter
             anchors.verticalCenter:  Drag.active ? undefined : parent.verticalCenter

diff --git a/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml b/modules/gui/qt/medialibrary/qml/MusicArtistDelegate.qml
@@ -41,7 +41,7 @@ T.Control {
     // Aliases
     // Private
 
-    property alias _isHover: mouseArea.containsMouse
+    readonly property bool _isHover: contentItem.containsMouse
 
     // Signals
 
@@ -69,8 +69,6 @@ T.Control {
     }
 
     contentItem: MouseArea {
-        id: mouseArea
-
         hoverEnabled: true
 
         drag.axis: Drag.XAndYAxis

diff --git a/modules/gui/qt/player/qml/ControlBar.qml b/modules/gui/qt/player/qml/ControlBar.qml
@@ -114,8 +114,6 @@ Control {
     }
 
     contentItem: ColumnLayout {
-        id: columnLayout
-
         spacing: VLCStyle.margin_xsmall
         z: 1
 

diff --git a/modules/gui/qt/player/qml/PlayerMenuItem.qml b/modules/gui/qt/player/qml/PlayerMenuItem.qml
@@ -37,7 +37,7 @@ T.MenuItem {
 
     //implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
     //                        implicitContentWidth + leftPadding + rightPadding)
-    implicitHeight: contentId.implicitHeight + topPadding + bottomPadding
+    implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
 
     padding: VLCStyle.margin_xsmall
     spacing: VLCStyle.margin_xsmall
@@ -83,7 +83,6 @@ T.MenuItem {
     }
 
     contentItem:  IconLabel {
-        id: contentId
         implicitHeight: VLCStyle.fontHeight_normal
 
         readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0

diff --git a/modules/gui/qt/player/qml/TracksMenu.qml b/modules/gui/qt/player/qml/TracksMenu.qml
@@ -60,8 +60,6 @@ T.Popup {
     }
 
     contentItem: StackView {
-        id: view
-
         focus: true
         clip: true
 

diff --git a/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/PlayButton.qml
@@ -163,8 +163,6 @@ T.Control {
     }
 
     contentItem: T.Label {
-        id: contentLabel
-
         text: {
             var state = Player.playingState
 

diff --git a/modules/gui/qt/player/qml/controlbarcontrols/RecordButton.qml b/modules/gui/qt/player/qml/controlbarcontrols/RecordButton.qml
@@ -35,8 +35,6 @@ Widgets.IconToolButton {
     onClicked: Player.toggleRecord()
 
     contentItem: T.Label {
-        id: content
-
         anchors.centerIn: parent
 
         verticalAlignment: Text.AlignVCenter
@@ -55,7 +53,7 @@ Widgets.IconToolButton {
             running: control.enabled && Player.recording
 
             onStopped: {
-                content.color = control.color
+                control.contentItem.color = control.color
             }
         }
 

diff --git a/modules/gui/qt/playlist/qml/PlaylistDelegate.qml b/modules/gui/qt/playlist/qml/PlaylistDelegate.qml
@@ -95,8 +95,6 @@ T.Control {
     }
 
     contentItem: RowLayout {
-        id: content
-
         spacing: 0
 
         Item {

diff --git a/modules/gui/qt/widgets/qml/GridItem.qml b/modules/gui/qt/widgets/qml/GridItem.qml
@@ -37,7 +37,7 @@ T.Control {
     property int titleMargin: VLCStyle.margin_xsmall
     property Item dragItem: null
 
-    readonly property bool highlighted: (mouseArea.containsMouse || visualFocus)
+    readonly property bool highlighted: (contentItem.containsMouse || visualFocus)
 
     readonly property int selectedBorderWidth: VLCStyle.gridItemSelectedBorder
 
@@ -166,8 +166,6 @@ T.Control {
     }
 
     contentItem: MouseArea {
-        id: mouseArea
-
         implicitWidth: layout.implicitWidth
         implicitHeight: layout.implicitHeight
 

diff --git a/modules/gui/qt/widgets/qml/TableViewDelegate.qml b/modules/gui/qt/widgets/qml/TableViewDelegate.qml
@@ -159,7 +159,8 @@ T.Control {
     }
 
     contentItem: Row {
-        id: content
+        leftPadding: VLCStyle.margin_xxxsmall
+        rightPadding: VLCStyle.margin_xxxsmall
 
         spacing: VLCStyle.column_spacing
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,8 +114,6 @@ Control { @@
         }
         contentItem: ColumnLayout {
-            id: columnLayout
             spacing: VLCStyle.margin_xsmall
             z: 1
@@ Expand Down @@