diff options
author | Doris Verria <[email protected]> | 2025-03-19 19:34:56 +0100 |
---|---|---|
committer | Doris Verria <[email protected]> | 2025-03-20 18:47:22 +0100 |
commit | 669a61a9d0c5f578bc594f832863c1ad7f1e537e (patch) | |
tree | 4c0e04ff273ba8fd6345b256cf388ea7018ffc65 | |
parent | e26b0ab97b0c02dbe9d32c496a54835c64bc2b3b (diff) |
FluentWinUI3 Style: Hide private QML properties
The style declares several QML dynamic properties which are meant to be
private. Hide them using __ convention.
Pick-to: 6.9 6.8
Change-Id: I4317d2ee7072a72fda1736fc8c9165a980889d95
Reviewed-by: Richard Moe Gustavsen <[email protected]>
30 files changed, 378 insertions, 377 deletions
diff --git a/src/quickcontrols/fluentwinui3/Button.qml b/src/quickcontrols/fluentwinui3/Button.qml index fa91fc904e..3b85d5ae7e 100644 --- a/src/quickcontrols/fluentwinui3/Button.qml +++ b/src/quickcontrols/fluentwinui3/Button.qml @@ -14,20 +14,20 @@ T.Button { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 - icon.width: config.icon.width - icon.height: config.icon.height + icon.width: __config.icon.width + icon.height: __config.icon.height icon.color: __buttonText readonly property color __buttonText: { @@ -53,7 +53,7 @@ T.Button { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: (control.flat && Config.controls.flatbutton + readonly property var __config: (control.flat && Config.controls.flatbutton ? Config.controls.flatbutton[__currentState] : Config.controls.button[__currentState]) || {} @@ -63,7 +63,7 @@ T.Button { spacing: control.spacing mirrored: control.mirrored display: control.display - alignment: control.config.label.textVAlignment | control.config.label.textHAlignment + alignment: control.__config.label.textVAlignment | control.__config.label.textHAlignment icon: control.icon text: control.text font: control.font @@ -72,9 +72,9 @@ T.Button { background: ButtonBackground { control: control - implicitHeight: control.config.background.height - implicitWidth: control.config.background.width - radius: control.config.background.topOffset + implicitHeight: control.__config.background.height + implicitWidth: control.__config.background.width + radius: control.__config.background.topOffset subtle: control.flat } } diff --git a/src/quickcontrols/fluentwinui3/CheckBox.qml b/src/quickcontrols/fluentwinui3/CheckBox.qml index 68a7a333a5..514fccf35f 100644 --- a/src/quickcontrols/fluentwinui3/CheckBox.qml +++ b/src/quickcontrols/fluentwinui3/CheckBox.qml @@ -15,17 +15,17 @@ T.CheckBox { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ control.checkState === Qt.Checked && "checked", @@ -34,21 +34,22 @@ T.CheckBox { control.checkState === Qt.PartiallyChecked && "partiallyChecked", control.down && "pressed", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.checkbox[__currentState] || {} - readonly property bool mirroredIndicator: control.mirrored !== (config.mirrored || false) + readonly property var __config: Config.controls.checkbox[__currentState] || {} + + readonly property bool __mirroredIndicator: control.mirrored !== (__config.mirrored || false) readonly property Item __focusFrameTarget: control indicator: Impl.CheckIndicator { - x: control.text ? (control.mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + x: control.text ? (control.__mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control - filePath: Qt.resolvedUrl(control.config.indicator.filePath) + filePath: Qt.resolvedUrl(control.__config.indicator.filePath) } contentItem: Text { - leftPadding: control.indicator && !control.mirroredIndicator ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirroredIndicator ? control.indicator.width + control.spacing : 0 + leftPadding: control.indicator && !control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 + rightPadding: control.indicator && control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 text: control.text font: control.font @@ -59,6 +60,6 @@ T.CheckBox { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/src/quickcontrols/fluentwinui3/CheckDelegate.qml b/src/quickcontrols/fluentwinui3/CheckDelegate.qml index 794a8f84ff..319877d36c 100644 --- a/src/quickcontrols/fluentwinui3/CheckDelegate.qml +++ b/src/quickcontrols/fluentwinui3/CheckDelegate.qml @@ -17,10 +17,10 @@ T.CheckDelegate { spacing: 10 - topPadding: config.topPadding || 0 + verticalOffset - leftPadding: config.leftPadding || 0 + __horizontalOffset - rightPadding: config.rightPadding || 0 + __horizontalOffset - bottomPadding: config.bottomPadding || 0 + __verticalOffset + topPadding: __config.topPadding || 0 + verticalOffset + leftPadding: __config.leftPadding || 0 + __horizontalOffset + rightPadding: __config.rightPadding || 0 + __horizontalOffset + bottomPadding: __config.bottomPadding || 0 + __verticalOffset icon.width: 16 icon.height: 16 @@ -39,7 +39,7 @@ T.CheckDelegate { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.itemdelegate[__currentState] || {} + readonly property var __config: Config.controls.itemdelegate[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -79,7 +79,7 @@ T.CheckDelegate { property Item backgroundImage: Impl.StyleImage { parent: control.background - imageConfig: control.config.background + imageConfig: control.__config.background implicitWidth: parent.width - control.__horizontalOffset * 2 implicitHeight: parent.height - control.__verticalOffset * 2 x: control.__horizontalOffset diff --git a/src/quickcontrols/fluentwinui3/ComboBox.qml b/src/quickcontrols/fluentwinui3/ComboBox.qml index 25f31bd809..93c6b6a6cb 100644 --- a/src/quickcontrols/fluentwinui3/ComboBox.qml +++ b/src/quickcontrols/fluentwinui3/ComboBox.qml @@ -17,17 +17,17 @@ T.ComboBox { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.contentItem.spacing || 0 + spacing: __config.contentItem.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: (config.leftPadding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 - rightPadding: (config.rightPadding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: (__config.leftPadding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 + rightPadding: (__config.rightPadding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)) || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", @@ -35,7 +35,7 @@ T.ComboBox { control.down && control.popup.visible && "open", control.pressed && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: (control.editable && control.down && control.popup.visible // editable combobox differs from normal one only in opened state + readonly property var __config: (control.editable && control.down && control.popup.visible // editable combobox differs from normal one only in opened state ? Config.controls.editablecombobox[__currentState] : Config.controls.combobox[__currentState]) || {} @@ -53,9 +53,9 @@ T.ComboBox { } indicator: Image { - x: control.mirrored ? control.config.leftPadding : control.width - width - control.config.rightPadding + x: control.mirrored ? control.__config.leftPadding : control.width - width - control.__config.rightPadding y: (control.topPadding + (control.availableHeight - height) / 2) + (control.pressed ? 1 : 0) - source: Qt.resolvedUrl(control.config.indicator.filePath) + source: Qt.resolvedUrl(control.__config.indicator.filePath) Behavior on y { NumberAnimation{ easing.type: Easing.OutCubic; duration: 167 } @@ -65,10 +65,10 @@ T.ComboBox { contentItem: T.TextField { text: control.editable ? control.editText : control.displayText - topPadding: control.config.label_contentItem.topPadding || 0 - leftPadding: control.config.label_contentItem.leftPadding || 0 - rightPadding: control.config.label_contentItem.rightPadding || 0 - bottomPadding: control.config.label_contentItem.bottomPadding || 0 + topPadding: control.__config.label_contentItem.topPadding || 0 + leftPadding: control.__config.label_contentItem.leftPadding || 0 + rightPadding: control.__config.label_contentItem.rightPadding || 0 + bottomPadding: control.__config.label_contentItem.bottomPadding || 0 implicitWidth: (implicitBackgroundWidth + leftInset + rightInset) || contentWidth + leftPadding + rightPadding @@ -89,14 +89,14 @@ T.ComboBox { color: control.down ? __pressedText : control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - horizontalAlignment: control.config.label_text.textHAlignment - verticalAlignment: control.config.label_text.textVAlignment + horizontalAlignment: control.__config.label_text.textHAlignment + verticalAlignment: control.__config.label_text.textVAlignment readonly property Item __focusFrameControl: control } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background Item { visible: control.editable && ((control.down && control.popup.visible) || control.activeFocus) width: parent.width @@ -105,17 +105,17 @@ T.ComboBox { Impl.FocusStroke { width: parent.width height: parent.height - radius: control.down && control.popup.visible ? 0 : control.config.background.bottomOffset + radius: control.down && control.popup.visible ? 0 : control.__config.background.bottomOffset color: control.palette.accent } } } popup: T.Popup { - topPadding: control.config.popup_contentItem.topPadding || 0 - leftPadding: control.config.popup_contentItem.leftPadding || 0 - rightPadding: control.config.popup_contentItem.rightPadding || 0 - bottomPadding: control.config.popup_contentItem.bottomPadding || 0 + topPadding: control.__config.popup_contentItem.topPadding || 0 + leftPadding: control.__config.popup_contentItem.leftPadding || 0 + rightPadding: control.__config.popup_contentItem.rightPadding || 0 + bottomPadding: control.__config.popup_contentItem.bottomPadding || 0 contentItem: ListView { clip: true @@ -140,7 +140,7 @@ T.ComboBox { } background: Impl.StyleImage { - imageConfig: control.config.popup_background.filePath ? control.config.popup_background : Config.controls.popup["normal"].background // fallback to regular popup + imageConfig: control.__config.popup_background.filePath ? control.__config.popup_background : Config.controls.popup["normal"].background // fallback to regular popup } } } diff --git a/src/quickcontrols/fluentwinui3/DelayButton.qml b/src/quickcontrols/fluentwinui3/DelayButton.qml index 47097f0255..633cb56532 100644 --- a/src/quickcontrols/fluentwinui3/DelayButton.qml +++ b/src/quickcontrols/fluentwinui3/DelayButton.qml @@ -14,15 +14,15 @@ T.DelayButton { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - icon.width: config.icon.width - icon.height: config.icon.height + icon.width: __config.icon.width + icon.height: __config.icon.height icon.color: __buttonText readonly property color __buttonText: { @@ -48,7 +48,7 @@ T.DelayButton { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.button[__currentState] || {} + readonly property var __config: Config.controls.button[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -90,9 +90,9 @@ T.DelayButton { background: ButtonBackground { control: control - implicitHeight: control.config.background.height - implicitWidth: control.config.background.width - radius: control.config.background.topOffset + implicitHeight: control.__config.background.height + implicitWidth: control.__config.background.width + radius: control.__config.background.topOffset subtle: false Rectangle { diff --git a/src/quickcontrols/fluentwinui3/Frame.qml b/src/quickcontrols/fluentwinui3/Frame.qml index b8f0b416b0..c244f0ab76 100644 --- a/src/quickcontrols/fluentwinui3/Frame.qml +++ b/src/quickcontrols/fluentwinui3/Frame.qml @@ -16,20 +16,20 @@ T.Frame { + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: !control.enabled ? "disabled" : "normal"; - readonly property var config: Config.controls.frame[__currentState] || {} + readonly property var __config: Config.controls.frame[__currentState] || {} background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/src/quickcontrols/fluentwinui3/GroupBox.qml b/src/quickcontrols/fluentwinui3/GroupBox.qml index 0522becace..1f10e5fca9 100644 --- a/src/quickcontrols/fluentwinui3/GroupBox.qml +++ b/src/quickcontrols/fluentwinui3/GroupBox.qml @@ -15,51 +15,51 @@ T.GroupBox { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - readonly property real __deltaY: (config.background.y - config.label.y) || 0 - readonly property real __deltaX: (config.background.x - config.label.x) || 0 - spacing: (__deltaY - config.label.height) || 0 + readonly property real __deltaY: (__config.background.y - __config.label.y) || 0 + readonly property real __deltaX: (__config.background.x - __config.label.x) || 0 + spacing: (__deltaY - __config.label.height) || 0 - topPadding: (config.topPadding || 0) + (spacing >= 0 ? (label.height + spacing) : __deltaY) - bottomPadding: config.bottomPadding || 0 - leftPadding: (config.leftPadding || 0) + (__deltaX >= 0 ? __deltaX : 0) - rightPadding: config.rightPadding || 0 + topPadding: (__config.topPadding || 0) + (spacing >= 0 ? (label.height + spacing) : __deltaY) + bottomPadding: __config.bottomPadding || 0 + leftPadding: (__config.leftPadding || 0) + (__deltaX >= 0 ? __deltaX : 0) + rightPadding: __config.rightPadding || 0 topInset: __deltaY > 0 ? __deltaY : 0 - bottomInset: -config.bottomInset || 0 + bottomInset: -__config.bottomInset || 0 leftInset: __deltaX > 0 ? __deltaX : 0 - rightInset: -config.rightInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.enabled && control.hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.groupbox[__currentState] || {} + readonly property var __config: Config.controls.groupbox[__currentState] || {} label: T.Label { x: control.__deltaX > 0 ? 0 : -__deltaX y: control.__deltaY > 0 ? 0 : -__deltaY - topPadding: control.config.label_contentItem.topPadding || 0 - leftPadding: control.config.label_contentItem.leftPadding || 0 - rightPadding: control.config.label_contentItem.rightPadding || 0 - bottomPadding: control.config.label_contentItem.bottomPadding || 0 + topPadding: control.__config.label_contentItem.topPadding || 0 + leftPadding: control.__config.label_contentItem.leftPadding || 0 + rightPadding: control.__config.label_contentItem.rightPadding || 0 + bottomPadding: control.__config.label_contentItem.bottomPadding || 0 - height: Math.max(implicitHeight, config.label.height) + height: Math.max(implicitHeight, __config.label.height) text: control.title font: control.font color: control.palette.windowText elide: Text.ElideRight - horizontalAlignment: control.config.label_text.textHAlignment - verticalAlignment: control.config.label_text.textVAlignment + horizontalAlignment: control.__config.label_text.textHAlignment + verticalAlignment: control.__config.label_text.textVAlignment background: Impl.StyleImage { - imageConfig: control.config.label_background + imageConfig: control.__config.label_background } } background: Impl.StyleImage { - imageConfig: control.config.background.filePath ? control.config.background : Config.controls.frame["normal"].background // fallback to regular frame background + imageConfig: control.__config.background.filePath ? control.__config.background : Config.controls.frame["normal"].background // fallback to regular frame background height: parent.height - control.topPadding + control.bottomPadding } } diff --git a/src/quickcontrols/fluentwinui3/ItemDelegate.qml b/src/quickcontrols/fluentwinui3/ItemDelegate.qml index d8620312cf..322d40a753 100644 --- a/src/quickcontrols/fluentwinui3/ItemDelegate.qml +++ b/src/quickcontrols/fluentwinui3/ItemDelegate.qml @@ -15,17 +15,17 @@ T.ItemDelegate { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 + verticalOffset - leftPadding: config.leftPadding || 0 + __horizontalOffset - rightPadding: config.rightPadding || 0 + __horizontalOffset - bottomPadding: config.bottomPadding || 0 + __verticalOffset + topPadding: __config.topPadding || 0 + verticalOffset + leftPadding: __config.leftPadding || 0 + __horizontalOffset + rightPadding: __config.rightPadding || 0 + __horizontalOffset + bottomPadding: __config.bottomPadding || 0 + __verticalOffset - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 icon.width: 16 icon.height: 16 @@ -43,7 +43,7 @@ T.ItemDelegate { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.itemdelegate[__currentState] || {} + readonly property var __config: Config.controls.itemdelegate[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -64,7 +64,7 @@ T.ItemDelegate { property Item backgroundImage: Impl.StyleImage { parent: control.background - imageConfig: control.config.background + imageConfig: control.__config.background implicitWidth: parent.width - control.__horizontalOffset * 2 implicitHeight: parent.height - control.__verticalOffset * 2 x: control.__horizontalOffset diff --git a/src/quickcontrols/fluentwinui3/Menu.qml b/src/quickcontrols/fluentwinui3/Menu.qml index d87e550807..312f0d7442 100644 --- a/src/quickcontrols/fluentwinui3/Menu.qml +++ b/src/quickcontrols/fluentwinui3/Menu.qml @@ -15,10 +15,10 @@ T.Menu { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - leftInset: -config.background.leftShadow - topInset: -config.background.topShadow - rightInset: -config.background.rightShadow - bottomInset: -config.background.bottomShadow + leftInset: -__config.background.leftShadow + topInset: -__config.background.topShadow + rightInset: -__config.background.rightShadow + bottomInset: -__config.background.bottomShadow leftPadding: 5 topPadding: 5 @@ -27,7 +27,7 @@ T.Menu { margins: 0 overlap: 4 - readonly property var config: Config.controls.popup["normal"] + readonly property var __config: Config.controls.popup["normal"] delegate: MenuItem { } @@ -57,7 +57,7 @@ T.Menu { background: Impl.StyleImage { implicitWidth: 200 + imageConfig.leftShadow + imageConfig.rightShadow implicitHeight: 30 + imageConfig.topShadow + imageConfig.bottomShadow - imageConfig: config.background + imageConfig: control.__config.background drawShadowWithinBounds: true } diff --git a/src/quickcontrols/fluentwinui3/MenuBar.qml b/src/quickcontrols/fluentwinui3/MenuBar.qml index 915d8a4cb4..028092442d 100644 --- a/src/quickcontrols/fluentwinui3/MenuBar.qml +++ b/src/quickcontrols/fluentwinui3/MenuBar.qml @@ -14,14 +14,14 @@ T.MenuBar { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: SafeArea.margins.top + (config.topPadding || 0) - bottomPadding: SafeArea.margins.bottom + (config.bottomPadding || 0) - leftPadding: SafeArea.margins.left + (config.leftPadding || 0) - rightPadding: SafeArea.margins.right + (config.rightPadding || 0) + topPadding: SafeArea.margins.top + (__config.topPadding || 0) + bottomPadding: SafeArea.margins.bottom + (__config.bottomPadding || 0) + leftPadding: SafeArea.margins.left + (__config.leftPadding || 0) + rightPadding: SafeArea.margins.right + (__config.rightPadding || 0) - readonly property var config: Config.controls.toolbar["normal"] || {} + readonly property var __config: Config.controls.toolbar["normal"] || {} delegate: MenuBarItem { } @@ -33,6 +33,6 @@ T.MenuBar { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/src/quickcontrols/fluentwinui3/MenuBarItem.qml b/src/quickcontrols/fluentwinui3/MenuBarItem.qml index bd5c4c649e..5020589b11 100644 --- a/src/quickcontrols/fluentwinui3/MenuBarItem.qml +++ b/src/quickcontrols/fluentwinui3/MenuBarItem.qml @@ -15,20 +15,20 @@ T.MenuBarItem { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 - icon.width: config.icon.width - icon.height: config.icon.height + icon.width: __config.icon.width + icon.height: __config.icon.height icon.color: !control.down ? control.palette.buttonText : Application.styleHints.colorScheme === Qt.Light ? Qt.rgba(control.palette.buttonText.r, control.palette.buttonText.g, control.palette.buttonText.b, 0.62) : Qt.rgba(control.palette.buttonText.r, control.palette.buttonText.g, control.palette.buttonText.b, 0.7725) @@ -38,7 +38,7 @@ T.MenuBarItem { control.enabled && !control.down && (control.hovered || control.highlighted) && "hovered", down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.toolbutton[__currentState] || {} + readonly property var __config: Config.controls.toolbutton[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -58,7 +58,7 @@ T.MenuBarItem { control: control implicitHeight: 30 implicitWidth: 30 - radius: control.config.background.topOffset + radius: control.__config.background.topOffset subtle: !control.checked || control.flat accented: control.checked } diff --git a/src/quickcontrols/fluentwinui3/PageIndicator.qml b/src/quickcontrols/fluentwinui3/PageIndicator.qml index e9251fc3bd..572562c9d9 100644 --- a/src/quickcontrols/fluentwinui3/PageIndicator.qml +++ b/src/quickcontrols/fluentwinui3/PageIndicator.qml @@ -14,23 +14,23 @@ T.PageIndicator { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.enabled && control.hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.pageindicator[__currentState] || {} + readonly property var __config: Config.controls.pageindicator[__currentState] || {} delegate: Impl.StyleImage { required property int index @@ -64,6 +64,6 @@ T.PageIndicator { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/src/quickcontrols/fluentwinui3/Popup.qml b/src/quickcontrols/fluentwinui3/Popup.qml index 47923731a6..01b7db7bb6 100644 --- a/src/quickcontrols/fluentwinui3/Popup.qml +++ b/src/quickcontrols/fluentwinui3/Popup.qml @@ -14,18 +14,18 @@ T.Popup { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: "normal" - readonly property var config: Config.controls.popup[__currentState] || {} + readonly property var __config: Config.controls.popup[__currentState] || {} enter: Transition { NumberAnimation { property: "opacity"; from: 0.0; to: 1.0; easing.type: Easing.Linear; duration: 83 } @@ -40,7 +40,7 @@ T.Popup { background: Impl.StyleImage { implicitWidth: 320 implicitHeight: 72 - imageConfig: control.config.background + imageConfig: control.__config.background } T.Overlay.modal: Rectangle { diff --git a/src/quickcontrols/fluentwinui3/ProgressBar.qml b/src/quickcontrols/fluentwinui3/ProgressBar.qml index ef3e789c37..33999fa872 100644 --- a/src/quickcontrols/fluentwinui3/ProgressBar.qml +++ b/src/quickcontrols/fluentwinui3/ProgressBar.qml @@ -15,25 +15,25 @@ T.ProgressBar { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.indeterminate && "indeterminate" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.progressbar[__currentState] || {} + readonly property var __config: Config.controls.progressbar[__currentState] || {} contentItem: Item { implicitWidth: control.indeterminate ? parent.availableWidth : progress.implicitWidth - implicitHeight: control.indeterminate ? control.config.track.height : progress.implicitHeight + implicitHeight: control.indeterminate ? control.__config.track.height : progress.implicitHeight scale: control.mirrored ? -1 : 1 clip: control.indeterminate @@ -42,26 +42,26 @@ T.ProgressBar { y: control.background.groove?.y - 1 parent: control.contentItem visible: !control.indeterminate && control.value - implicitWidth: control.config.track.width - implicitHeight: control.config.track.height + implicitWidth: control.__config.track.width + implicitHeight: control.__config.track.height width: control.position * parent.width - height: control.config.track.height - radius: control.config.track.height * 0.5 + height: control.__config.track.height + radius: control.__config.track.height * 0.5 color: control.palette.accent } readonly property Rectangle animatedProgress: Rectangle { parent: control.contentItem implicitWidth: parent.width - implicitHeight: control.config.track.height - radius: control.config.track.height * 0.5 + implicitHeight: control.__config.track.height + radius: control.__config.track.height * 0.5 clip: true visible: false color: "transparent" Rectangle { width: 0.5 * parent.width - height: control.config.track.height - radius: control.config.track.height * 0.5 + height: control.__config.track.height + radius: control.__config.track.height * 0.5 color: control.palette.accent SequentialAnimation on x { loops: Animation.Infinite @@ -106,7 +106,7 @@ T.ProgressBar { background: Item { implicitWidth: groove.width property Item groove: Impl.StyleImage { - imageConfig: control.config.groove + imageConfig: control.__config.groove visible: !control.indeterminate parent: control.background height: implicitHeight diff --git a/src/quickcontrols/fluentwinui3/RadioButton.qml b/src/quickcontrols/fluentwinui3/RadioButton.qml index ad7ad67708..c2ee06b8d5 100644 --- a/src/quickcontrols/fluentwinui3/RadioButton.qml +++ b/src/quickcontrols/fluentwinui3/RadioButton.qml @@ -15,17 +15,17 @@ T.RadioButton { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ control.checked && "checked", @@ -33,16 +33,16 @@ T.RadioButton { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.radiobutton[__currentState] || {} - readonly property bool mirroredIndicator: control.mirrored !== (config.mirrored || false) + readonly property var __config: Config.controls.radiobutton[__currentState] || {} + readonly property bool __mirroredIndicator: control.mirrored !== (__config.mirrored || false) readonly property Item __focusFrameTarget: control indicator: Impl.RadioIndicator { - x: control.text ? (control.mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + x: control.text ? (control.__mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 control: control - filePath: Qt.resolvedUrl(control.config.indicator.filePath) + filePath: Qt.resolvedUrl(control.__config.indicator.filePath) } contentItem: Text { @@ -58,6 +58,6 @@ T.RadioButton { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/src/quickcontrols/fluentwinui3/RadioDelegate.qml b/src/quickcontrols/fluentwinui3/RadioDelegate.qml index 505d6b1e70..c67641ef32 100644 --- a/src/quickcontrols/fluentwinui3/RadioDelegate.qml +++ b/src/quickcontrols/fluentwinui3/RadioDelegate.qml @@ -17,10 +17,10 @@ T.RadioDelegate { spacing: 10 - topPadding: config.topPadding || 0 + verticalOffset - leftPadding: config.leftPadding || 0 + __horizontalOffset - rightPadding: config.rightPadding || 0 + __horizontalOffset - bottomPadding: config.bottomPadding || 0 + __verticalOffset + topPadding: __config.topPadding || 0 + verticalOffset + leftPadding: __config.leftPadding || 0 + __horizontalOffset + rightPadding: __config.rightPadding || 0 + __horizontalOffset + bottomPadding: __config.bottomPadding || 0 + __verticalOffset icon.width: 16 icon.height: 16 @@ -39,7 +39,7 @@ T.RadioDelegate { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.itemdelegate[__currentState] || {} + readonly property var __config: Config.controls.itemdelegate[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -78,7 +78,7 @@ T.RadioDelegate { property Item backgroundImage: Impl.StyleImage { parent: control.background - imageConfig: control.config.background + imageConfig: control.__config.background implicitWidth: parent.width - control.__horizontalOffset * 2 implicitHeight: parent.height - control.__verticalOffset * 2 x: control.__horizontalOffset diff --git a/src/quickcontrols/fluentwinui3/RangeSlider.qml b/src/quickcontrols/fluentwinui3/RangeSlider.qml index 94ebca4df2..e43667ca55 100644 --- a/src/quickcontrols/fluentwinui3/RangeSlider.qml +++ b/src/quickcontrols/fluentwinui3/RangeSlider.qml @@ -16,16 +16,16 @@ T.RangeSlider { first.implicitHandleHeight + topPadding + bottomPadding, second.implicitHandleHeight + topPadding + bottomPadding) - topPadding: horizontal ? config.topPadding : config.leftPadding || 0 - leftPadding: horizontal ? config.leftPadding : config.bottomPadding || 0 - rightPadding: horizontal ? config.rightPadding : config.topPadding || 0 - bottomPadding: horizontal ? config.bottomPadding : config.rightPadding || 0 + topPadding: horizontal ? __config.topPadding : __config.leftPadding || 0 + leftPadding: horizontal ? __config.leftPadding : __config.bottomPadding || 0 + rightPadding: horizontal ? __config.rightPadding : __config.topPadding || 0 + bottomPadding: horizontal ? __config.bottomPadding : __config.rightPadding || 0 readonly property string __controlState: [ !control.enabled && "disabled", control.enabled && control.hovered && !(first.pressed || second.pressed) && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.rangeslider[__controlState] || {} + readonly property var __config: Config.controls.rangeslider[__controlState] || {} readonly property real __steps: Math.abs(to - from) / stepSize readonly property bool __isDiscrete: stepSize >= Number.EPSILON @@ -36,14 +36,14 @@ T.RangeSlider { first.hovered && !first.pressed && "hovered", first.pressed && "handle_pressed", ].filter(Boolean).join("_") || "normal" - readonly property var firstHandleConfig: Config.controls.rangeslider[__firstHandleState] || {} + readonly property var __firstHandleConfig: Config.controls.rangeslider[__firstHandleState] || {} property string __secondHandleState: [ !control.enabled && "disabled", second.hovered && !second.pressed && "hovered", second.pressed && "handle_pressed", ].filter(Boolean).join("_") || "normal" - readonly property var secondHandleConfig: Config.controls.rangeslider[__secondHandleState] || {} + readonly property var __secondHandleConfig: Config.controls.rangeslider[__secondHandleState] || {} readonly property Item __focusFrameControl: control readonly property Item __focusFrameTarget: control @@ -56,7 +56,7 @@ T.RangeSlider { ? (control.availableHeight - height) / 2 : control.first.visualPosition * (control.availableHeight - height))) - imageConfig: control.firstHandleConfig.first_handle + imageConfig: control.__firstHandleConfig.first_handle readonly property Item __focusFrameTarget: control @@ -66,8 +66,8 @@ T.RangeSlider { width: diameter height: diameter radius: diameter * 0.5 - x: (control.secondHandleConfig.first_handle.width - width) / 2 - y: (control.secondHandleConfig.first_handle.height - height) / 2 + x: (control.__secondHandleConfig.first_handle.width - width) / 2 + y: (control.__secondHandleConfig.first_handle.height - height) / 2 color: control.enabled ? (control.first.hovered ? Qt.rgba(control.palette.accent.r, control.palette.accent.g, control.palette.accent.b, 0.9020) : control.first.pressed ? Qt.rgba(control.palette.accent.r, control.palette.accent.g, control.palette.accent.b, 0.8) : control.palette.accent) @@ -90,7 +90,7 @@ T.RangeSlider { ? (control.availableHeight - height) / 2 : control.second.visualPosition * (control.availableHeight - height))) - imageConfig: control.secondHandleConfig.second_handle + imageConfig: control.__secondHandleConfig.second_handle readonly property Item __focusFrameTarget: control @@ -100,8 +100,8 @@ T.RangeSlider { width: diameter height: diameter radius: diameter * 0.5 - x: (control.secondHandleConfig.second_handle.width - width) / 2 - y: (control.secondHandleConfig.second_handle.height - height) / 2 + x: (control.__secondHandleConfig.second_handle.width - width) / 2 + y: (control.__secondHandleConfig.second_handle.height - height) / 2 color: control.enabled ? (control.second.hovered ? Qt.rgba(control.palette.accent.r, control.palette.accent.g, control.palette.accent.b, 0.9020) : control.second.pressed ? Qt.rgba(control.palette.accent.r, control.palette.accent.g, control.palette.accent.b, 0.8) : control.palette.accent) @@ -128,41 +128,41 @@ T.RangeSlider { parent: control.background width: parent.width height: parent.width - imageConfig: control.config.background + imageConfig: control.__config.background property Item groove: Impl.StyleImage { parent: control.background._background x: control.leftPadding - control.leftInset + (control.horizontal - ? control.firstHandleConfig.first_handle.width / 2 + ? control.__firstHandleConfig.first_handle.width / 2 : (control.availableWidth - width) / 2) y: control.topPadding - control.rightInset + (control.horizontal ? ((control.availableHeight - height) / 2) - : control.firstHandleConfig.first_handle.height / 2) + : control.__firstHandleConfig.first_handle.height / 2) width: control.horizontal ? control.availableWidth - - (control.firstHandleConfig.first_handle.width / 2) - (control.secondHandleConfig.second_handle.width / 2) + - (control.__firstHandleConfig.first_handle.width / 2) - (control.__secondHandleConfig.second_handle.width / 2) : implicitWidth height: control.horizontal ? implicitHeight : control.availableHeight - - (control.firstHandleConfig.first_handle.width / 2) - (control.secondHandleConfig.second_handle.width / 2) - imageConfig: control.config.groove + - (control.__firstHandleConfig.first_handle.width / 2) - (control.__secondHandleConfig.second_handle.width / 2) + imageConfig: control.__config.groove horizontal: control.horizontal property Rectangle track: Rectangle { parent: control.background._background.groove x: control.horizontal ? parent.width * control.first.position : 0 y: control.horizontal ? 0 : parent.height - (parent.height * control.second.position) - implicitWidth: control.horizontal ? control.config.track.width : control.config.track.height - implicitHeight: control.horizontal ? control.config.track.height : control.config.track.width + implicitWidth: control.horizontal ? control.__config.track.width : control.__config.track.height + implicitHeight: control.horizontal ? control.__config.track.height : control.__config.track.width width: control.horizontal ? parent.width * (control.second.position - control.first.position) : parent.width height: control.horizontal ? parent.height : parent.height * (control.second.position - control.first.position) - radius: control.config.track.height * 0.5 + radius: control.__config.track.height * 0.5 color: control.palette.accent } } diff --git a/src/quickcontrols/fluentwinui3/RoundButton.qml b/src/quickcontrols/fluentwinui3/RoundButton.qml index 59bdf27427..39400f59bc 100644 --- a/src/quickcontrols/fluentwinui3/RoundButton.qml +++ b/src/quickcontrols/fluentwinui3/RoundButton.qml @@ -14,15 +14,15 @@ T.RoundButton { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - icon.width: config.icon.width - icon.height: config.icon.height + icon.width: __config.icon.width + icon.height: __config.icon.height icon.color: __buttonText readonly property color __buttonText: { @@ -48,7 +48,7 @@ T.RoundButton { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: (control.flat && Config.controls.flatbutton + readonly property var __config: (control.flat && Config.controls.flatbutton ? Config.controls.flatbutton[__currentState] : Config.controls.button[__currentState]) || {} @@ -67,7 +67,7 @@ T.RoundButton { background: ButtonBackground { control: control - implicitHeight: control.config.background.height + implicitHeight: control.__config.background.height implicitWidth: implicitWidth radius: control.radius } diff --git a/src/quickcontrols/fluentwinui3/Slider.qml b/src/quickcontrols/fluentwinui3/Slider.qml index 4184c92788..ca1f5b6711 100644 --- a/src/quickcontrols/fluentwinui3/Slider.qml +++ b/src/quickcontrols/fluentwinui3/Slider.qml @@ -14,17 +14,17 @@ T.Slider { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitHandleHeight + topPadding + bottomPadding) - topPadding: horizontal ? config.topPadding : config.leftPadding || 0 - leftPadding: horizontal ? config.leftPadding : config.bottomPadding || 0 - rightPadding: horizontal ? config.rightPadding : config.topPadding || 0 - bottomPadding: horizontal ? config.bottomPadding : config.rightPadding || 0 + topPadding: horizontal ? __config.topPadding : __config.leftPadding || 0 + leftPadding: horizontal ? __config.leftPadding : __config.bottomPadding || 0 + rightPadding: horizontal ? __config.rightPadding : __config.topPadding || 0 + bottomPadding: horizontal ? __config.bottomPadding : __config.rightPadding || 0 readonly property string __currentState: [ !control.enabled && "disabled", control.enabled && !control.pressed && control.hovered && "hovered", control.pressed && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.slider[__currentState] || {} + readonly property var __config: Config.controls.slider[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -40,7 +40,7 @@ T.Slider { ? (control.availableHeight - height) / 2 : control.visualPosition * (control.availableHeight - height))) - imageConfig: control.config.handle + imageConfig: control.__config.handle property Rectangle indicator: Rectangle { property real diameter: !control.enabled ? 10 : control.pressed ? 8 : control.hovered ? 14 : 10 @@ -48,8 +48,8 @@ T.Slider { width: diameter height: diameter radius: diameter * 0.5 - x: (control.config.handle.width - width) / 2 - y: (control.config.handle.height - height) / 2 + x: (control.__config.handle.width - width) / 2 + y: (control.__config.handle.height - height) / 2 color: control.enabled ? (control.hovered ? Qt.rgba(control.palette.accent.r, control.palette.accent.g, control.palette.accent.b, 0.9020) : control.pressed ? Qt.rgba(control.palette.accent.r, control.palette.accent.g, control.palette.accent.b, 0.8) @@ -77,34 +77,34 @@ T.Slider { parent: control.background width: parent.width height: parent.height - imageConfig: control.config.background + imageConfig: control.__config.background property Item groove: Impl.StyleImage { parent: control.background._background x: control.leftPadding - control.leftInset + (control.horizontal - ? control.config.handle.width / 2 + ? control.__config.handle.width / 2 : (control.availableWidth - width) / 2) y: control.topPadding - control.topInset + (control.horizontal ? ((control.availableHeight - height) / 2) - : control.config.handle.height / 2) + : control.__config.handle.height / 2) width: control.horizontal - ? control.availableWidth - control.config.handle.width + ? control.availableWidth - control.__config.handle.width : implicitWidth height: control.horizontal ? implicitHeight - : control.availableHeight - control.config.handle.width - imageConfig: control.config.groove + : control.availableHeight - control.__config.handle.width + imageConfig: control.__config.groove horizontal: control.horizontal property Rectangle track: Rectangle { parent: control.background._background.groove y: control.horizontal ? 0 : parent.height - (parent.height * control.position) - implicitWidth: control.horizontal ? control.config.track.width : control.config.track.height - implicitHeight: control.horizontal ? control.config.track.height : control.config.track.width + implicitWidth: control.horizontal ? control.__config.track.width : control.__config.track.height + implicitHeight: control.horizontal ? control.__config.track.height : control.__config.track.width width: control.horizontal ? parent.width * control.position : parent.width height: control.horizontal ? parent.height : parent.height * control.position - radius: control.config.track.height * 0.5 + radius: control.__config.track.height * 0.5 color: control.palette.accent } } diff --git a/src/quickcontrols/fluentwinui3/SpinBox.qml b/src/quickcontrols/fluentwinui3/SpinBox.qml index 6b4ca83c14..d806cb2aea 100644 --- a/src/quickcontrols/fluentwinui3/SpinBox.qml +++ b/src/quickcontrols/fluentwinui3/SpinBox.qml @@ -22,20 +22,20 @@ T.SpinBox { enabled && (down.pressed || up.pressed) && "pressed", !enabled && "disabled" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.spinbox[__controlState] || {} - readonly property var downConfig: value == from ? Config.controls.spinbox["atlimit"] : config - readonly property var upConfig: value == to ? Config.controls.spinbox["atlimit"] : config + readonly property var __config: Config.controls.spinbox[__controlState] || {} + readonly property var __downConfig: value == from ? Config.controls.spinbox["atlimit"] : __config + readonly property var __upConfig: value == to ? Config.controls.spinbox["atlimit"] : __config - spacing: config.contentItem.spacing || 0 - leftPadding: ((!mirrored ? config.leftPadding : config.rightPadding) || 0) + (mirrored ? (up.indicator ? up.indicator.width * 2 : 0) : 0) - rightPadding: ((!mirrored ? config.rightPadding : config.leftPadding) || 0) + (!mirrored ? (up.indicator ? up.indicator.width * 2 : 0) : 0) - topPadding: config.topPadding || 0 - bottomPadding: config?.bottomPadding || 0 + spacing: __config.contentItem.spacing || 0 + leftPadding: ((!mirrored ? __config.leftPadding : __config.rightPadding) || 0) + (mirrored ? (up.indicator ? up.indicator.width * 2 : 0) : 0) + rightPadding: ((!mirrored ? __config.rightPadding : __config.leftPadding) || 0) + (!mirrored ? (up.indicator ? up.indicator.width * 2 : 0) : 0) + topPadding: __config.topPadding || 0 + bottomPadding: __config?.bottomPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 validator: IntValidator { locale: control.locale.name @@ -62,34 +62,34 @@ T.SpinBox { down.indicator: Impl.StyleImage { x: !control.mirrored ? control.up.indicator ? (control.up.indicator.x - width) : 0 - : control.config.rightPadding + : control.__config.rightPadding y: control.topPadding height: control.availableHeight - imageConfig: control.downConfig.indicator_down_background + imageConfig: control.__downConfig.indicator_down_background Impl.StyleImage { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - imageConfig: control.downConfig.indicator_down_icon + imageConfig: control.__downConfig.indicator_down_icon } } up.indicator: Impl.StyleImage { - x: control.mirrored ? control.config.rightPadding + (control.down.indicator ? control.down.indicator.width : 0) - : control.width - width - control.config.rightPadding + x: control.mirrored ? control.__config.rightPadding + (control.down.indicator ? control.down.indicator.width : 0) + : control.width - width - control.__config.rightPadding y: control.topPadding height: control.availableHeight - imageConfig: control.upConfig.indicator_up_background + imageConfig: control.__upConfig.indicator_up_background Impl.StyleImage { x: (parent.width - width) / 2 y: (parent.height - height) / 2 - imageConfig: control.upConfig.indicator_up_icon + imageConfig: control.__upConfig.indicator_up_icon } } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background Item { visible: control.activeFocus width: parent.width @@ -98,7 +98,7 @@ T.SpinBox { Impl.FocusStroke { width: parent.width height: parent.height - radius: control.config.background.bottomOffset + radius: control.__config.background.bottomOffset color: control.palette.accent } } diff --git a/src/quickcontrols/fluentwinui3/SwipeDelegate.qml b/src/quickcontrols/fluentwinui3/SwipeDelegate.qml index 9714d33549..1073b06249 100644 --- a/src/quickcontrols/fluentwinui3/SwipeDelegate.qml +++ b/src/quickcontrols/fluentwinui3/SwipeDelegate.qml @@ -14,12 +14,12 @@ T.SwipeDelegate { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 - bottomPadding: config.bottomPadding || 0 + topPadding: __config.topPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 + bottomPadding: __config.bottomPadding || 0 icon.width: 16 icon.height: 16 @@ -34,7 +34,7 @@ T.SwipeDelegate { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.itemdelegate[__currentState] || {} + readonly property var __config: Config.controls.itemdelegate[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -53,8 +53,8 @@ T.SwipeDelegate { } background: Rectangle { - implicitWidth: control.config.background.width - implicitHeight: control.config.background.height + implicitWidth: control.__config.background.width + implicitHeight: control.__config.background.height readonly property bool lightScheme: Application.styleHints.colorScheme === Qt.Light readonly property color bakcgroundColorTint: control.down ? lightScheme ? Color.transparent("black", 0.02) : Color.transparent("white", 0.04) diff --git a/src/quickcontrols/fluentwinui3/Switch.qml b/src/quickcontrols/fluentwinui3/Switch.qml index 4f4de060b5..761b7b8329 100644 --- a/src/quickcontrols/fluentwinui3/Switch.qml +++ b/src/quickcontrols/fluentwinui3/Switch.qml @@ -16,17 +16,17 @@ T.Switch { implicitContentHeight + topPadding + bottomPadding, implicitIndicatorHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: control.text ? config.topPadding || 0 : 0 - leftPadding: control.text ? config.leftPadding || 0 : 0 - rightPadding: control.text ? config.rightPadding || 0 : 0 - bottomPadding: control.text ? config.bottomPadding || 0 : 0 + topPadding: control.text ? __config.topPadding || 0 : 0 + leftPadding: control.text ? __config.leftPadding || 0 : 0 + rightPadding: control.text ? __config.rightPadding || 0 : 0 + bottomPadding: control.text ? __config.bottomPadding || 0 : 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: [ control.checked && "checked", @@ -34,22 +34,22 @@ T.Switch { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.switch_[__currentState] || {} - readonly property bool mirroredIndicator: control.mirrored !== (config.mirrored || false) + readonly property var __config: Config.controls.switch_[__currentState] || {} + readonly property bool __mirroredIndicator: control.mirrored !== (__config.mirrored || false) readonly property Item __focusFrameTarget: control indicator: SwitchIndicator { - x: control.text ? (control.mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 + x: control.text ? (control.__mirroredIndicator ? control.width - width - control.rightPadding : control.leftPadding) : control.leftPadding + (control.availableWidth - width) / 2 y: control.topPadding + (control.availableHeight - height) / 2 - implicitWidth: control.config.handle_background.width - implicitHeight: control.config.handle_background.height + implicitWidth: control.__config.handle_background.width + implicitHeight: control.__config.handle_background.height control: control } contentItem: Text { - leftPadding: control.indicator && !control.mirroredIndicator ? control.indicator.width + control.spacing : 0 - rightPadding: control.indicator && control.mirroredIndicator ? control.indicator.width + control.spacing : 0 + leftPadding: control.indicator && !control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 + rightPadding: control.indicator && control.__mirroredIndicator ? control.indicator.width + control.spacing : 0 text: control.text font: control.font diff --git a/src/quickcontrols/fluentwinui3/SwitchDelegate.qml b/src/quickcontrols/fluentwinui3/SwitchDelegate.qml index f7dcc44607..9adfd2e4e0 100644 --- a/src/quickcontrols/fluentwinui3/SwitchDelegate.qml +++ b/src/quickcontrols/fluentwinui3/SwitchDelegate.qml @@ -17,10 +17,10 @@ T.SwitchDelegate { spacing: 10 - topPadding: config.topPadding || 0 + verticalOffset - leftPadding: config.leftPadding || 0 + __horizontalOffset - rightPadding: config.rightPadding || 0 + __horizontalOffset - bottomPadding: config.bottomPadding || 0 + __verticalOffset + topPadding: __config.topPadding || 0 + verticalOffset + leftPadding: __config.leftPadding || 0 + __horizontalOffset + rightPadding: __config.rightPadding || 0 + __horizontalOffset + bottomPadding: __config.bottomPadding || 0 + __verticalOffset icon.width: 16 icon.height: 16 @@ -39,7 +39,7 @@ T.SwitchDelegate { control.enabled && !control.down && control.hovered && "hovered", control.down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.itemdelegate[__currentState] || {} + readonly property var __config: Config.controls.itemdelegate[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -79,7 +79,7 @@ T.SwitchDelegate { property Item backgroundImage: Impl.StyleImage { parent: control.background - imageConfig: control.config.background + imageConfig: control.__config.background implicitWidth: parent.width - control.__horizontalOffset * 2 implicitHeight: parent.height - control.__verticalOffset * 2 x: control.__horizontalOffset diff --git a/src/quickcontrols/fluentwinui3/TabBar.qml b/src/quickcontrols/fluentwinui3/TabBar.qml index 477ae781a6..4b79ae168a 100644 --- a/src/quickcontrols/fluentwinui3/TabBar.qml +++ b/src/quickcontrols/fluentwinui3/TabBar.qml @@ -14,28 +14,28 @@ T.TabBar { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: position === TabBar.Header ? (enabled ? "normal" : "disabled") : (enabled ? "normal_footer" : "disabled_footer") - readonly property var config: Config.controls.tabbar[__currentState] || {} + readonly property var __config: Config.controls.tabbar[__currentState] || {} contentItem: ListView { model: control.contentModel currentIndex: control.currentIndex - spacing: control.config.spacing + spacing: control.__config.spacing orientation: ListView.Horizontal boundsBehavior: Flickable.StopAtBounds flickableDirection: Flickable.AutoFlickIfNeeded @@ -48,6 +48,6 @@ T.TabBar { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/src/quickcontrols/fluentwinui3/TabButton.qml b/src/quickcontrols/fluentwinui3/TabButton.qml index cbf938f172..27575bdf84 100644 --- a/src/quickcontrols/fluentwinui3/TabButton.qml +++ b/src/quickcontrols/fluentwinui3/TabButton.qml @@ -14,17 +14,17 @@ T.TabButton { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 icon.width: 16 icon.height: 16 @@ -36,7 +36,7 @@ T.TabButton { enabled && !down && hovered && "hovered", down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.tabbutton[__currentState] || {} + readonly property var __config: Config.controls.tabbutton[__currentState] || {} readonly property color __pressedText: Application.styleHints.colorScheme == Qt.Light ? Qt.rgba(control.palette.buttonText.r, control.palette.buttonText.g, control.palette.buttonText.b, 0.447) @@ -51,7 +51,7 @@ T.TabButton { spacing: control.spacing mirrored: control.mirrored display: control.display - alignment: control.config.label.textVAlignment | control.config.label.textHAlignment + alignment: control.__config.label.textVAlignment | control.__config.label.textHAlignment text: control.text font: control.font icon: control.icon @@ -59,7 +59,7 @@ T.TabButton { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background property Rectangle selector: Rectangle { parent: control.background x: (parent.width - implicitWidth) / 2 diff --git a/src/quickcontrols/fluentwinui3/TextArea.qml b/src/quickcontrols/fluentwinui3/TextArea.qml index 0932cbeea0..ebd10b6dc4 100644 --- a/src/quickcontrols/fluentwinui3/TextArea.qml +++ b/src/quickcontrols/fluentwinui3/TextArea.qml @@ -15,15 +15,15 @@ T.TextArea { contentHeight + topPadding + bottomPadding, placeholder.implicitHeight + topPadding + bottomPadding) - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 color: control.palette.text selectionColor: control.palette.highlight @@ -36,7 +36,7 @@ T.TextArea { activeFocus && "focused", enabled && !activeFocus && hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.textarea[__currentState] || {} + readonly property var __config: Config.controls.textarea[__currentState] || {} ContextMenu.menu: Impl.TextEditingContextMenu { control: control @@ -60,7 +60,7 @@ T.TextArea { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background Item{ visible: control.activeFocus width: parent.width @@ -69,7 +69,7 @@ T.TextArea { Impl.FocusStroke { width: parent.width height: parent.height - radius: control.config.background.bottomOffset + radius: control.__config.background.bottomOffset color: control.palette.accent } } diff --git a/src/quickcontrols/fluentwinui3/TextField.qml b/src/quickcontrols/fluentwinui3/TextField.qml index c24328938a..08ce94f5d4 100644 --- a/src/quickcontrols/fluentwinui3/TextField.qml +++ b/src/quickcontrols/fluentwinui3/TextField.qml @@ -20,17 +20,17 @@ T.TextField { activeFocus && "focused", enabled && !activeFocus && hovered && "hovered", ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.textfield[__currentState] || {} + readonly property var __config: Config.controls.textfield[__currentState] || {} - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 color: control.palette.text selectionColor: control.palette.highlight @@ -60,7 +60,7 @@ T.TextField { } background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background Item{ visible: control.activeFocus width: parent.width @@ -69,7 +69,7 @@ T.TextField { Impl.FocusStroke { width: parent.width height: parent.height - radius: control.config.background.bottomOffset + radius: control.__config.background.bottomOffset color: control.palette.accent } } diff --git a/src/quickcontrols/fluentwinui3/ToolBar.qml b/src/quickcontrols/fluentwinui3/ToolBar.qml index 5f5b2a8d9d..154f9a765f 100644 --- a/src/quickcontrols/fluentwinui3/ToolBar.qml +++ b/src/quickcontrols/fluentwinui3/ToolBar.qml @@ -13,24 +13,24 @@ T.ToolBar { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: SafeArea.margins.top + (config.topPadding || 0) - bottomPadding: SafeArea.margins.bottom + (config.bottomPadding || 0) - leftPadding: SafeArea.margins.left + (config.leftPadding || 0) - rightPadding: SafeArea.margins.right + (config.rightPadding || 0) + topPadding: SafeArea.margins.top + (__config.topPadding || 0) + bottomPadding: SafeArea.margins.bottom + (__config.bottomPadding || 0) + leftPadding: SafeArea.margins.left + (__config.leftPadding || 0) + rightPadding: SafeArea.margins.right + (__config.rightPadding || 0) - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 readonly property string __currentState: position === ToolBar.Header ? (enabled ? "normal" : "disabled") : (enabled ? "normal_footer" : "disabled_footer") - readonly property var config: Config.controls.toolbar[__currentState] || {} + readonly property var __config: Config.controls.toolbar[__currentState] || {} background: Impl.StyleImage { - imageConfig: control.config.background + imageConfig: control.__config.background } } diff --git a/src/quickcontrols/fluentwinui3/ToolButton.qml b/src/quickcontrols/fluentwinui3/ToolButton.qml index 130ca26463..dc955c6278 100644 --- a/src/quickcontrols/fluentwinui3/ToolButton.qml +++ b/src/quickcontrols/fluentwinui3/ToolButton.qml @@ -14,20 +14,20 @@ T.ToolButton { implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, implicitContentHeight + topPadding + bottomPadding) - spacing: config.spacing || 0 + spacing: __config.spacing || 0 - topPadding: config.topPadding || 0 - bottomPadding: config.bottomPadding || 0 - leftPadding: config.leftPadding || 0 - rightPadding: config.rightPadding || 0 + topPadding: __config.topPadding || 0 + bottomPadding: __config.bottomPadding || 0 + leftPadding: __config.leftPadding || 0 + rightPadding: __config.rightPadding || 0 - topInset: -config.topInset || 0 - bottomInset: -config.bottomInset || 0 - leftInset: -config.leftInset || 0 - rightInset: -config.rightInset || 0 + topInset: -__config.topInset || 0 + bottomInset: -__config.bottomInset || 0 + leftInset: -__config.leftInset || 0 + rightInset: -__config.rightInset || 0 - icon.width: config.icon.width - icon.height: config.icon.height + icon.width: __config.icon.width + icon.height: __config.icon.height icon.color: __buttonText readonly property color __buttonText: { @@ -53,7 +53,7 @@ T.ToolButton { control.enabled && !control.down && control.hovered && "hovered", down && "pressed" ].filter(Boolean).join("_") || "normal" - readonly property var config: Config.controls.toolbutton[__currentState] || {} + readonly property var __config: Config.controls.toolbutton[__currentState] || {} readonly property Item __focusFrameTarget: control @@ -70,9 +70,9 @@ T.ToolButton { background: ButtonBackground { control: control - implicitHeight: control.config.background.height + implicitHeight: control.__config.background.height implicitWidth: implicitHeight - radius: control.config.background.topOffset + radius: control.__config.background.topOffset subtle: !(control.checked || control.highlighted) || control.flat } } diff --git a/src/quickcontrols/fluentwinui3/ToolSeparator.qml b/src/quickcontrols/fluentwinui3/ToolSeparator.qml index 60db530474..222a1cdbce 100644 --- a/src/quickcontrols/fluentwinui3/ToolSeparator.qml +++ b/src/quickcontrols/fluentwinui3/ToolSeparator.qml @@ -13,16 +13,16 @@ T.ToolSeparator { implicitContentHeight + topPadding + bottomPadding) padding: 2 - topPadding: vertical ? config.topPadding : padding - bottomPadding: vertical ? config.bottomPadding : padding - leftPadding: vertical ? padding : config.topPadding - rightPadding: vertical ? padding : config.bottomPadding + topPadding: vertical ? __config.topPadding : padding + bottomPadding: vertical ? __config.bottomPadding : padding + leftPadding: vertical ? padding : __config.topPadding + rightPadding: vertical ? padding : __config.bottomPadding - readonly property var config: Config.controls.toolbutton["normal"] || {} + readonly property var __config: Config.controls.toolbutton["normal"] || {} contentItem: Rectangle { - implicitWidth: control.vertical ? 1 : control.config.background.height - implicitHeight: control.vertical ? control.config.background.height : 1 + implicitWidth: control.vertical ? 1 : control.__config.background.height + implicitHeight: control.vertical ? control.__config.background.height : 1 color: Application.styleHints.colorScheme === Qt.Light ? "#0F000000" : "#15FFFFFF" } } |