From 4b08a5611a8c7523f12b39cf67ab1a3812e68858 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Tue, 5 Sep 2017 11:37:03 +0200
Subject: [PATCH] Make topbar transparent and update text style

CURA-4213
---
 resources/qml/Topbar.qml               |  2 +-
 resources/themes/cura-light/styles.qml | 18 +++++-------------
 resources/themes/cura-light/theme.json |  8 ++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml
index 3fd7baef1c..e29b9abf86 100644
--- a/resources/qml/Topbar.qml
+++ b/resources/qml/Topbar.qml
@@ -16,7 +16,7 @@ Rectangle
     anchors.left: parent.left
     anchors.right: parent.right
     height: UM.Theme.getSize("sidebar_header").height
-    color: UM.Theme.getColor("sidebar_header_bar")
+    color: "transparent"
 
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
     property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
diff --git a/resources/themes/cura-light/styles.qml b/resources/themes/cura-light/styles.qml
index 57c08ca9d6..cfe35ca789 100755
--- a/resources/themes/cura-light/styles.qml
+++ b/resources/themes/cura-light/styles.qml
@@ -102,15 +102,7 @@ QtObject {
                     anchors.fill: parent;
                     property bool down: control.pressed || (control.checkable && control.checked);
 
-                    color: {
-                        if(control.pressed || (control.checkable && control.checked)) {
-                            return Theme.getColor("sidebar_header_active");
-                        } else if(control.hovered) {
-                            return Theme.getColor("sidebar_header_hover");
-                        } else {
-                            return Theme.getColor("sidebar_header_bar");
-                        }
-                    }
+                    color: "transparent"
                     Behavior on color { ColorAnimation { duration: 50; } }
 
                     Rectangle {
@@ -165,20 +157,20 @@ QtObject {
                         anchors.left: icon.right
                         anchors.leftMargin: icon.visible ? Theme.getSize("default_margin").width : 0
                         anchors.verticalCenter: parent.verticalCenter;
-                        font: UM.Theme.getFont("large");
+                        font: control.checked ? UM.Theme.getFont("large") : UM.Theme.getFont("large_nonbold")
                         color:
                         {
                             if(control.hovered)
                             {
-                                return UM.Theme.getColor("sidebar_header_text_hover");
+                                return UM.Theme.getColor("topbar_button_text_hovered");
                             }
                             if(control.checked)
                             {
-                                return UM.Theme.getColor("sidebar_header_text_active");
+                                return UM.Theme.getColor("topbar_button_text_active");
                             }
                             else
                             {
-                                return UM.Theme.getColor("sidebar_header_text_inactive");
+                                return UM.Theme.getColor("topbar_button_text_inactive");
                             }
                         }
                     }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 6d666b6413..85f62c2851 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -9,6 +9,10 @@
             "bold": true,
             "family": "Open Sans"
         },
+        "large_nonbold": {
+            "size": 1.25,
+            "family": "Open Sans"
+        },
         "default": {
             "size": 1.15,
             "family": "Open Sans"
@@ -59,6 +63,10 @@
         "border": [127, 127, 127, 255],
         "secondary": [245, 245, 245, 255],
 
+        "topbar_button_text_active": [0, 0, 0, 255],
+        "topbar_button_text_inactive": [128, 128, 128, 255],
+        "topbar_button_text_hovered": [0, 0, 0, 255],
+
         "text": [24, 41, 77, 255],
         "text_detail": [174, 174, 174, 128],
         "text_link": [12, 169, 227, 255],