From 93197cd173cd095821c4c8781bf50c1665821fae Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Sun, 30 Apr 2017 23:21:49 +0200
Subject: [PATCH] Add hover effect to mode switch text labels

---
 resources/qml/Sidebar.qml        | 44 +++++++++++++++++++++++++++-----
 resources/themes/cura/theme.json |  2 +-
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml
index 68427cad8c..f4d264b12c 100755
--- a/resources/qml/Sidebar.qml
+++ b/resources/qml/Sidebar.qml
@@ -408,18 +408,34 @@ Rectangle
         }
         ExclusiveGroup { id: modeMenuGroup; }
 
-        Text
+        Label
         {
             id: toggleLeftText
             anchors.right: modeToggleSwitch.left
             anchors.rightMargin: UM.Theme.getSize("default_margin").width
             anchors.verticalCenter: parent.verticalCenter
             text: ""
-            color: UM.Theme.getColor("toggle_active_text")
+            color:
+            {
+                if(toggleLeftTextMouseArea.containsMouse)
+                {
+                    return UM.Theme.getColor("toggle_button_text_hover");
+                }
+                else if(!modeToggleSwitch.checked)
+                {
+                    return UM.Theme.getColor("toggle_button_text_checked");
+                }
+                else
+                {
+                    return UM.Theme.getColor("toggle_button_text");
+                }
+            }
             font: UM.Theme.getFont("default")
 
             MouseArea
             {
+                id: toggleLeftTextMouseArea
+                hoverEnabled: true
                 anchors.fill: parent
                 onClicked:
                 {
@@ -441,11 +457,11 @@ Rectangle
             anchors.rightMargin: UM.Theme.getSize("default_margin").width
             anchors.verticalCenter: parent.verticalCenter
 
-            property alias _hovered: enableSupportMouseArea.containsMouse
+            property bool _hovered: modeToggleSwitchMouseArea.containsMouse || toggleLeftTextMouseArea.containsMouse || toggleRightTextMouseArea.containsMouse
 
             MouseArea
             {
-                id: enableSupportMouseArea
+                id: modeToggleSwitchMouseArea
                 anchors.fill: parent
                 hoverEnabled: true
                 acceptedButtons: Qt.NoButton
@@ -470,17 +486,33 @@ Rectangle
             style: UM.Theme.styles.toggle_button
         }
 
-        Text
+        Label
         {
             id: toggleRightText
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
             text: ""
-            color: UM.Theme.getColor("toggle_active_text")
+            color:
+            {
+                if(toggleRightTextMouseArea.containsMouse)
+                {
+                    return UM.Theme.getColor("toggle_button_text_hover");
+                }
+                else if(modeToggleSwitch.checked)
+                {
+                    return UM.Theme.getColor("toggle_button_text_checked");
+                }
+                else
+                {
+                    return UM.Theme.getColor("toggle_button_text");
+                }
+            }
             font: UM.Theme.getFont("default")
 
             MouseArea
             {
+                id: toggleRightTextMouseArea
+                hoverEnabled: true
                 anchors.fill: parent
                 onClicked:
                 {
diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json
index 531b233fec..37267046b0 100644
--- a/resources/themes/cura/theme.json
+++ b/resources/themes/cura/theme.json
@@ -182,7 +182,7 @@
         "toggle_button_handle": [24, 41, 77, 255],
         "toggle_button_text": [24, 41, 77, 255],
         "toggle_button_text_hover": [24, 41, 77, 255],
-        "toggle_button_text_selected": [24, 41, 77, 255],
+        "toggle_button_text_checked": [12, 169, 227, 255],
 
         "tooltip": [12, 169, 227, 255],
         "tooltip_text": [255, 255, 255, 255],