From a1acfe167c9b59bf01c063a35a57d243c0506ad2 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Fri, 2 Dec 2016 15:31:55 +0100
Subject: [PATCH] Fixed UI spacing if there is no material conflict in project
 load

CURA-1263
---
 plugins/3MFReader/WorkspaceDialog.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml
index 9ec437d247..c36d4b9b26 100644
--- a/plugins/3MFReader/WorkspaceDialog.qml
+++ b/plugins/3MFReader/WorkspaceDialog.qml
@@ -217,6 +217,7 @@ UM.Dialog
             {
                 width: parent.width
                 height: childrenRect.height
+                visible: manager.materialConflict
                 Item
                 {
                     width: parent.width / 3 * 2
@@ -228,7 +229,7 @@ UM.Dialog
                     id: materialResolveTooltip
                     width: parent.width / 3
                     height: visible ? comboboxHeight : 0
-                    visible: manager.materialConflict
+
                     text: catalog.i18nc("@info:tooltip", "How should the conflict in the material be resolved?")
                     ComboBox
                     {