From e18528d2ca596ce74ed3d722c681193155f4e259 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Wed, 6 Sep 2017 15:49:54 +0200
Subject: [PATCH] Fix position of the material compatibility warning

CURA-4148
---
 resources/qml/SidebarHeader.qml        | 31 +++++++++++++-------------
 resources/themes/cura-light/theme.json |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 391b6c131a..3c26638b0a 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -357,6 +357,22 @@ Column
             anchors.right: parent.right
             width: parent.width * 0.7 + UM.Theme.getSize("sidebar_margin").width
 
+            UM.RecolorImage
+            {
+                id: warningImage
+                anchors.right: materialInfoLabel.left
+                anchors.rightMargin: UM.Theme.getSize("default_margin").width
+                anchors.verticalCenter: parent.Bottom
+                source: UM.Theme.getIcon("warning")
+                width: UM.Theme.getSize("section_icon").width
+                height: UM.Theme.getSize("section_icon").height
+                //sourceSize.width: width + 5
+                //sourceSize.height: width + 5
+
+                color: UM.Theme.getColor("setting_validation_warning")
+                visible: !Cura.MachineManager.isCurrentSetupSupported
+            }
+
             Text
             {
                 id: materialInfoLabel
@@ -395,21 +411,6 @@ Column
                     onExited: base.hideTooltip();
                 }
             }
-
-            UM.RecolorImage
-            {
-                id: warningImage
-                anchors.right: parent.right
-                anchors.verticalCenter: parent.Bottom
-                source: UM.Theme.getIcon("warning")
-                width: UM.Theme.getSize("section_icon").width
-                height: UM.Theme.getSize("section_icon").height
-                //sourceSize.width: width + 5
-                //sourceSize.height: width + 5
-
-                color: UM.Theme.getColor("setting_validation_warning")
-                visible: !Cura.MachineManager.isCurrentSetupSupported
-            }
         }
     }
 
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 46d5ff0662..d4d12c24cd 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -173,7 +173,7 @@
         "setting_validation_error_background": [255, 57, 14, 255],
         "setting_validation_error": [127, 127, 127, 255],
         "setting_validation_warning_background": [255, 186, 15, 255],
-        "setting_validation_warning": [127, 127, 127, 255],
+        "setting_validation_warning": [0, 0, 0, 255],
         "setting_validation_ok": [255, 255, 255, 255],
 
         "progressbar_background": [245, 245, 245, 255],