fix switches

leinir · Jul 22, 2021 · 7324a46 · 7324a46
1 parent 1254f4f
commit 7324a46
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/qml-ui/components/Controller.qml b/qml-ui/components/Controller.qml
@@ -136,6 +136,12 @@ Card {
                 scale: root.valueType === "bool"
                 enabled: root.valueType === "bool"
                 onClicked: root.controller.value = root.controller.value == root.controller.value0 ? root.controller.max_value : root.controller.value0
+                Behavior on scale {
+                        NumberAnimation {
+                            duration: Kirigami.Units.longDuration
+                            easing.type: Easing.InOutQuad
+                        }
+                    }
                 QQC2.Switch {
                     id: switchControl
                     anchors.centerIn: parent
@@ -150,12 +156,7 @@ Card {
                         property: "color"
                         value: switchControl.checked ? Kirigami.Theme.highlightColor : switchControl.palette.midlight
                     }*/
-                    Behavior on scale {
-                        NumberAnimation {
-                            duration: Kirigami.Units.longDuration
-                            easing.type: Easing.InOutQuad
-                        }
-                    }
+
                     Kirigami.Heading {
                         anchors {
                             horizontalCenter: parent.horizontalCenter

diff --git a/qtquick-controls-style/Zynthian-Plasma/Switch.qml b/qtquick-controls-style/Zynthian-Plasma/Switch.qml
@@ -24,6 +24,7 @@ T.Switch {
     hoverEnabled: true
 
     indicator: SwitchIndicator {
+		control: control
         LayoutMirroring.enabled: control.mirrored
         LayoutMirroring.childrenInherit: true
         anchors {

diff --git a/qtquick-controls-style/Zynthian-Plasma/SwitchIndicator.qml b/qtquick-controls-style/Zynthian-Plasma/SwitchIndicator.qml
@@ -10,6 +10,7 @@ import "private" as Private
 import org.kde.kirigami 2.4 as Kirigami
 
 Item {
+	id: root
     property Item control
     implicitWidth: Math.round(Kirigami.Units.gridUnit * 1.5)
     implicitHeight : Kirigami.Units.gridUnit
@@ -21,7 +22,7 @@ Item {
         radius: height
         Kirigami.Theme.inherit: false
         Kirigami.Theme.colorSet: Kirigami.Theme.Button
-        color: switchControl.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
+        color: control.checked ? Kirigami.Theme.highlightColor : Kirigami.Theme.backgroundColor
         border.color: Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.4)
     }