From a9672458fd31ffb7c64273b88a779a9f262b19d6 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Wed, 21 Nov 2018 13:46:50 +0100
Subject: [PATCH] Update extruderIcon to be more in line with the design

CURA-5785
---
 resources/qml/ExtruderIcon.qml                         | 10 ++++++----
 .../ConfigurationMenu/QuickConfigurationSelector.qml   |  3 +--
 resources/themes/cura-light/theme.json                 |  9 +++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index 79106bdd3a..1e51835d60 100644
--- a/resources/qml/ExtruderIcon.qml
+++ b/resources/qml/ExtruderIcon.qml
@@ -9,8 +9,8 @@ Item
 {
     id: extruderIconItem
 
-    implicitWidth: UM.Theme.getSize("button").width
-    implicitHeight: implicitWidth
+    implicitWidth: UM.Theme.getSize("extruder_icon").width
+    implicitHeight: UM.Theme.getSize("extruder_icon").height
 
     property bool checked: true
     property color materialColor
@@ -22,7 +22,7 @@ Item
         anchors.fill: parent
 
         sourceSize.width: parent.width
-        sourceSize.height: parent.width
+        sourceSize.height: parent.height
         source: UM.Theme.getIcon("extruder_button")
         color: extruderEnabled ? materialColor: "gray"
     }
@@ -49,11 +49,13 @@ Item
             id: extruderNumberText
             anchors.centerIn: parent
             text: index + 1
-            font: UM.Theme.getFont("default")
+            font: UM.Theme.getFont("extruder_icon")
             width: contentWidth
             height: contentHeight
             visible: extruderEnabled
             renderType: Text.NativeRendering
+            horizontalAlignment: Text.alignHCenter
+            verticalAlignment: Text.alignVCenter
         }
 
         UM.RecolorImage
diff --git a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
index ef7a425a87..eb6800cb36 100644
--- a/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
+++ b/resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml
@@ -50,8 +50,7 @@ Cura.ExpandableComponent
                     id: extruderIcon
                     materialColor: model.color
                     extruderEnabled: model.enabled
-                    height: parent.height
-                    width: height
+                    anchors.verticalCenter: parent.verticalCenter
                 }
 
                 // Label for the brand of the material
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index d28611529b..b09370ccdb 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -64,6 +64,12 @@
             "size": 1.15,
             "weight": 50,
             "family": "Noto Sans"
+        },
+        "extruder_icon":
+        {
+            "size": 0.7,
+            "weight": 50,
+            "family": "Noto Sans"
         }
     },
 
@@ -406,8 +412,7 @@
         "thin_margin": [0.71, 0.71],
         "narrow_margin": [0.5, 0.5],
 
-        "extruder_button_material_margin": [0.70, 0.9],
-        "extruder_button_material": [0.75, 0.75],
+        "extruder_icon": [1.8, 1.8],
 
         "simple_mode_infill_caption": [0.0, 5.0],
         "simple_mode_infill_height": [0.0, 8.0],