From fcfe95c7d0a7217bd5793ee5e5148b835bae29c4 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Wed, 14 Nov 2018 12:57:57 +0100
Subject: [PATCH] Move OpenFile button to be instantiated left so it's tooltip
 doesn't get messed up

CURA-5785
---
 plugins/PrepareStage/PrepareMenu.qml | 43 ++++++++++++++--------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml
index 3c7235a26f..78f9ced1e7 100644
--- a/plugins/PrepareStage/PrepareMenu.qml
+++ b/plugins/PrepareStage/PrepareMenu.qml
@@ -26,27 +26,6 @@ Item
         width: openFileButtonBackground.width + itemRowBackground.width
         height: parent.height
 
-        Rectangle
-        {
-            id: openFileButtonBackground
-            height: UM.Theme.getSize("stage_menu").height
-            width: UM.Theme.getSize("stage_menu").height
-
-            radius: UM.Theme.getSize("default_radius").width
-            color: UM.Theme.getColor("toolbar_background")
-            Button
-            {
-                id: openFileButton
-                text: catalog.i18nc("@action:button", "Open File")
-                iconSource: UM.Theme.getIcon("load")
-                style: UM.Theme.styles.toolbar_button
-                tooltip: ""
-                action: Cura.Actions.open
-                anchors.centerIn: parent
-            }
-        }
-
-
         Rectangle
         {
             id: itemRowBackground
@@ -73,7 +52,7 @@ Item
                 Cura.MachineSelector
                 {
                     id: machineSelection
-                    z: openFileButton.z - 1
+                    z: openFileButtonBackground.z - 1
 
                     Layout.minimumWidth: 240
                     Layout.maximumWidth: 240
@@ -118,5 +97,25 @@ Item
                 }
             }
         }
+
+        Rectangle
+        {
+            id: openFileButtonBackground
+            height: UM.Theme.getSize("stage_menu").height
+            width: UM.Theme.getSize("stage_menu").height
+
+            radius: UM.Theme.getSize("default_radius").width
+            color: UM.Theme.getColor("toolbar_background")
+            Button
+            {
+                id: openFileButton
+                text: catalog.i18nc("@action:button", "Open File")
+                iconSource: UM.Theme.getIcon("load")
+                style: UM.Theme.styles.toolbar_button
+                tooltip: ""
+                action: Cura.Actions.open
+                anchors.centerIn: parent
+            }
+        }
     }
 }
\ No newline at end of file