Merge pull request #3957 from Holzhaus/qml-controlproxy-reset

QML: Add QmlControlProxy::reset() method
mixxxdj · Jun 7, 2021 · a0d1c2d · a0d1c2d
2 parents 937658a + 9238dc1
commit a0d1c2d
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 54 deletions.
diff --git a/res/skins/QMLDemo/ControlKnob.qml b/res/skins/QMLDemo/ControlKnob.qml
@@ -1,5 +1,6 @@
 import "." as Skin
 import Mixxx 0.1 as Mixxx
+import QtQuick 2.12
 
 Skin.Knob {
     id: root
@@ -14,4 +15,8 @@ Skin.Knob {
         id: control
     }
 
+    TapHandler {
+        onDoubleTapped: control.reset()
+    }
+
 }
diff --git a/res/skins/QMLDemo/ControlSlider.qml b/res/skins/QMLDemo/ControlSlider.qml
@@ -1,5 +1,6 @@
 import "." as Skin
 import Mixxx 0.1 as Mixxx
+import QtQuick 2.12
 
 Skin.Slider {
     property alias group: control.group
@@ -12,4 +13,8 @@ Skin.Slider {
         id: control
     }
 
+    TapHandler {
+        onDoubleTapped: control.reset()
+    }
+
 }
diff --git a/res/skins/QMLDemo/CrossfaderRow.qml b/res/skins/QMLDemo/CrossfaderRow.qml
@@ -18,7 +18,7 @@ Item {
         anchors.bottom: parent.bottom
     }
 
-    Skin.ResettableControlSlider {
+    Skin.ControlSlider {
         id: crossfaderSlider
 
         orientation: Qt.Horizontal

diff --git a/res/skins/QMLDemo/Deck.qml b/res/skins/QMLDemo/Deck.qml
@@ -22,7 +22,7 @@ Item {
         group: root.group
     }
 
-    Skin.ResettableControlSlider {
+    Skin.ControlSlider {
         id: rateSlider
 
         visible: !root.minimized

diff --git a/res/skins/QMLDemo/EqKnob.qml b/res/skins/QMLDemo/EqKnob.qml
@@ -16,7 +16,7 @@ Rectangle {
     height: 56
     radius: 5
 
-    Skin.ResettableControlKnob {
+    Skin.ControlKnob {
         id: knob
 
         anchors.centerIn: root

diff --git a/res/skins/QMLDemo/MixerColumn.qml b/res/skins/QMLDemo/MixerColumn.qml
@@ -18,7 +18,7 @@ Item {
         color: Theme.knobBackgroundColor
         radius: 5
 
-        Skin.ResettableControlKnob {
+        Skin.ControlKnob {
             id: gainKnob
 
             anchors.centerIn: parent
@@ -57,7 +57,7 @@ Item {
             key: "VuMeterR"
         }
 
-        Skin.ResettableControlSlider {
+        Skin.ControlSlider {
             id: volumeSlider
 
             anchors.fill: parent

diff --git a/res/skins/QMLDemo/ResettableControlKnob.qml b/res/skins/QMLDemo/ResettableControlKnob.qml
diff --git a/res/skins/QMLDemo/ResettableControlSlider.qml b/res/skins/QMLDemo/ResettableControlSlider.qml
diff --git a/src/skin/qml/qmlcontrolproxy.cpp b/src/skin/qml/qmlcontrolproxy.cpp
@@ -105,6 +105,13 @@ double QmlControlProxy::getParameter() const {
     return m_pControlProxy->getParameter();
 }
 
+void QmlControlProxy::reset() {
+    if (!isInitialized()) {
+        return;
+    }
+    m_pControlProxy->reset();
+}
+
 void QmlControlProxy::reinitializeFromKey() {
     // Just ignore this if the component is still loading, because group or key may not be set yet.
     if (!m_isComponentComplete) {

diff --git a/src/skin/qml/qmlcontrolproxy.h b/src/skin/qml/qmlcontrolproxy.h
@@ -55,6 +55,9 @@ class QmlControlProxy : public QObject, public QQmlParserStatus {
     bool isKeyValid() const;
     bool isInitialized() const;
 
+    /// Reset the control to the default value.
+    Q_INVOKABLE void reset();
+
   signals:
     void groupChanged(const QString& group);
     void keyChanged(const QString& key);