From d00bb2524e92d56cdbedc741d3da2c1b1fbac628 Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Tue, 11 Jul 2017 17:21:17 +0200
Subject: [PATCH] Fix layout

Dialog is now more robust against being too small
---
 .../MachineSettingsAction.qml                      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 2653865b26..13e100590f 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -41,7 +41,7 @@ Cura.MachineAction
     anchors.fill: parent;
     Item
     {
-        id: bedLevelMachineAction
+        id: machineSettingsAction
         anchors.fill: parent;
 
         UM.I18nCatalog { id: catalog; name: "cura"; }
@@ -233,7 +233,6 @@ Cura.MachineAction
 
                             UM.TooltipArea
                             {
-                                id: extruderCountControl
                                 visible: manager.definedExtruderCount > 1
                                 height: childrenRect.height
                                 width: childrenRect.width
@@ -246,6 +245,8 @@ Cura.MachineAction
                                     Label
                                     {
                                         text: catalog.i18nc("@label", "Number of Extruders")
+                                        elide: Text.ElideRight
+                                        width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - extruderCountComboBox.width)
                                         anchors.verticalCenter: extruderCountComboBox.verticalCenter
                                     }
                                     ComboBox
@@ -553,6 +554,8 @@ Cura.MachineAction
                 {
                     text: _label
                     visible: _label != ""
+                    elide: Text.ElideRight
+                    width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - textFieldWithUnit.width)
                     anchors.verticalCenter: textFieldWithUnit.verticalCenter
                 }
 
@@ -644,7 +647,9 @@ Cura.MachineAction
                 {
                     text: _label
                     visible: _label != ""
-                    anchors.verticalCenter: textFieldWithUnit.verticalCenter
+                    elide: Text.ElideRight
+                    width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - comboBox.width)
+                    anchors.verticalCenter: comboBox.verticalCenter
                 }
                 ComboBox
                 {
@@ -774,11 +779,14 @@ Cura.MachineAction
                 {
                     text: _label
                     visible: _label != ""
+                    elide: Text.ElideRight
+                    width: Math.max(0, settingsTabs.columnWidth - 2 * UM.Theme.getSize("default_margin").width - textFieldWithUnit.width)
                     anchors.verticalCenter: textFieldWithUnit.verticalCenter
                 }
 
                 Item
                 {
+                    id: textFieldWithUnit
                     width: textField.width
                     height: textField.height