From 61c46312707faab26ed8d3cb9ecba9e4c0687a9a Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Wed, 19 Apr 2017 08:56:08 +0200
Subject: [PATCH] Put sizes and numbers for toggle button into theme

CURA-3574
---
 resources/qml/Sidebar.qml        |  4 ++--
 resources/themes/cura/styles.qml | 12 ++++++------
 resources/themes/cura/theme.json |  7 ++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index aeb86c9dbd..e4ad4ff305 100644
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -423,7 +423,7 @@ Rectangle
         {
             id: toggleLeftText
             anchors.right: modeToggleSwitch.left
-            anchors.rightMargin: 10
+            anchors.rightMargin: UM.Theme.getSize("toggle_button_text_anchoring_margin").width
             anchors.verticalCenter: parent.verticalCenter
             text: ""
             color: UM.Theme.getColor("toggle_active_text")
@@ -435,7 +435,7 @@ Rectangle
             id: modeToggleSwitch
             checked: false
             anchors.right: toggleRightText.left
-            anchors.rightMargin: 10
+            anchors.rightMargin: UM.Theme.getSize("toggle_button_text_anchoring_margin").width
             anchors.verticalCenter: parent.verticalCenter
 
             onClicked:
diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml
index 9b553236c8..a7c7dcb6cd 100644
--- a/resources/themes/cura/styles.qml
+++ b/resources/themes/cura/styles.qml
@@ -11,9 +11,9 @@ QtObject {
     property Component toggle_button: Component {
         SwitchStyle {
             groove: Rectangle {
-                implicitWidth: 30
-                implicitHeight: 15
-                radius: 9
+                implicitWidth: UM.Theme.getSize("toggle_button_background_implicit_size").width
+                implicitHeight: UM.Theme.getSize("toggle_button_background_implicit_size").height
+                radius: UM.Theme.getSize("toggle_button_radius").width
                 border.color: {
                     if (control.pressed || (control.checkable && control.checked)) {
                         return UM.Theme.getColor("sidebar_header_active");
@@ -28,9 +28,9 @@ QtObject {
             }
 
             handle: Rectangle {
-                implicitHeight: 15
-                implicitWidth: 15
-                radius: 9
+                implicitWidth: UM.Theme.getSize("toggle_button_knob_implicit_size").width
+                implicitHeight: UM.Theme.getSize("toggle_button_knob_implicit_size").height
+                radius: UM.Theme.getSize("toggle_button_radius").width
 
                 color: {
                     if (control.pressed || (control.checkable && control.checked)) {
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index fa4bf2ee92..084ee27bb2 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -319,6 +319,11 @@
 
         "infill_button_margin": [0.5, 0.5],
 
-        "jobspecs_line": [2.0, 2.0]
+        "jobspecs_line": [2.0, 2.0],
+
+        "toggle_button_text_anchoring_margin": [1.0, 1.0],
+        "toggle_button_radius": [1.0, 1.0],
+        "toggle_button_background_implicit_size": [2.0, 1.0],
+        "toggle_button_knob_implicit_size": [1.0, 1.0]
     }
 }