From bd636e61a0577b8f5f7eac160fa0af05757240c6 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Wed, 21 Nov 2018 13:17:36 +0100
Subject: [PATCH] Minor changes suggested in review

CURA-5785
---
 plugins/PrepareStage/PrepareMenu.qml                   | 2 +-
 plugins/PreviewStage/PreviewMenu.qml                   | 3 ++-
 plugins/SimulationView/SimulationViewMenuComponent.qml | 7 +++++--
 resources/qml/ExtruderIcon.qml                         | 1 +
 resources/qml/MachineSelector.qml                      | 3 +++
 resources/qml/PrintSetupSelector.qml                   | 1 +
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml
index bf2a0e1283..963908cea6 100644
--- a/plugins/PrepareStage/PrepareMenu.qml
+++ b/plugins/PrepareStage/PrepareMenu.qml
@@ -34,7 +34,7 @@ Item
             anchors.left: openFileButtonBackground.right
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
 
-            width: 0.9 * prepareMenu.width
+            width: Math.round(0.9 * prepareMenu.width)
             height: parent.height
             spacing: 0
 
diff --git a/plugins/PreviewStage/PreviewMenu.qml b/plugins/PreviewStage/PreviewMenu.qml
index 29632e5f00..656cf185d5 100644
--- a/plugins/PreviewStage/PreviewMenu.qml
+++ b/plugins/PreviewStage/PreviewMenu.qml
@@ -54,7 +54,7 @@ Item
             {
                 // Nothing was active, so just return the first one (the list is sorted by priority, so the most
                 // important one should be returned)
-                if(activeView == null)
+                if (activeView == null)
                 {
                     UM.Controller.setActiveView(viewModel.getItem(0).id)
                 }
@@ -68,6 +68,7 @@ Item
                 elide: Text.ElideRight
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text")
+                renderType: Text.NativeRendering
             }
 
             popupItem: Column
diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml
index caf47508e3..110cd1c109 100644
--- a/plugins/SimulationView/SimulationViewMenuComponent.qml
+++ b/plugins/SimulationView/SimulationViewMenuComponent.qml
@@ -132,6 +132,7 @@ Cura.ExpandableComponent
             visible: UM.SimulationView.compatibilityMode
             height: UM.Theme.getSize("layerview_row").height
             width: parent.width
+            renderType: Text.NativeRendering
         }
 
         Item  // Spacer
@@ -188,7 +189,7 @@ Cura.ExpandableComponent
                         leftMargin: UM.Theme.getSize("checkbox").width + Math.round(UM.Theme.getSize("default_margin").width / 2)
                         rightMargin: UM.Theme.getSize("default_margin").width * 2
                     }
-
+                    renderType: Text.NativeRendering
                 }
             }
         }
@@ -254,6 +255,7 @@ Cura.ExpandableComponent
                     text: label
                     font: UM.Theme.getFont("default")
                     elide: Text.ElideRight
+                    renderType: Text.NativeRendering
                     color: UM.Theme.getColor("setting_control_text")
                     anchors.verticalCenter: parent.verticalCenter
                     anchors.left: legendModelCheckBox.left
@@ -310,7 +312,7 @@ Cura.ExpandableComponent
                 width: parent.width
                 color: UM.Theme.getColor("setting_control_text")
                 font: UM.Theme.getFont("default")
-
+                renderType: Text.NativeRendering
                 Rectangle
                 {
                     anchors.verticalCenter: parent.verticalCenter
@@ -357,6 +359,7 @@ Cura.ExpandableComponent
                 anchors.left: parent.left
                 color: UM.Theme.getColor("setting_control_text")
                 font: UM.Theme.getFont("default")
+                renderType: Text.NativeRendering
             }
 
             Label
diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml
index 87e210e75a..79106bdd3a 100644
--- a/resources/qml/ExtruderIcon.qml
+++ b/resources/qml/ExtruderIcon.qml
@@ -53,6 +53,7 @@ Item
             width: contentWidth
             height: contentHeight
             visible: extruderEnabled
+            renderType: Text.NativeRendering
         }
 
         UM.RecolorImage
diff --git a/resources/qml/MachineSelector.qml b/resources/qml/MachineSelector.qml
index c9756d93ba..750ac7f620 100644
--- a/resources/qml/MachineSelector.qml
+++ b/resources/qml/MachineSelector.qml
@@ -33,6 +33,7 @@ Cura.ExpandableComponent
         elide: Text.ElideRight
         font: UM.Theme.getFont("default")
         color: UM.Theme.getColor("text")
+        renderType: Text.NativeRendering
     }
 
     popupItem: Item
@@ -60,6 +61,7 @@ Cura.ExpandableComponent
                     height: visible ? contentHeight + 2 * UM.Theme.getSize("default_margin").height : 0
                     font: UM.Theme.getFont("medium_bold")
                     color: UM.Theme.getColor("text")
+                    renderType: Text.NativeRendering
                     verticalAlignment: Text.AlignVCenter
                 }
 
@@ -103,6 +105,7 @@ Cura.ExpandableComponent
                     font: UM.Theme.getFont("medium_bold")
                     color: UM.Theme.getColor("text")
                     verticalAlignment: Text.AlignVCenter
+                    renderType: Text.NativeRendering
                 }
 
                 Repeater
diff --git a/resources/qml/PrintSetupSelector.qml b/resources/qml/PrintSetupSelector.qml
index b843244147..2ecdc9e546 100644
--- a/resources/qml/PrintSetupSelector.qml
+++ b/resources/qml/PrintSetupSelector.qml
@@ -182,6 +182,7 @@ Cura.ExpandableComponent
                     verticalAlignment: Text.AlignVCenter
                     renderType: Text.NativeRendering
                     elide: Text.ElideRight
+
                     color:
                     {
                         if(control.pressed)