From c15089cd59c2f97145f49ac804cb7c7911a0f946 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 7 Feb 2019 14:13:00 +0100 Subject: [PATCH] Some minor cleanup of the QML CURA-5916 --- .../Menus/ConfigurationMenu/CustomConfiguration.qml | 11 +++++------ resources/themes/cura-light/theme.json | 1 - 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 663e2497ed..fc4272dc93 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -185,7 +185,7 @@ Item Row { - height: UM.Theme.getSize("print_setup_item").height + height: visible ? childrenRect.height : 0 visible: extrudersModel.count > 1 // If there is only one extruder, there is no point to enable/disable that. Label @@ -222,7 +222,7 @@ Item Row { - height: UM.Theme.getSize("print_setup_big_item").height + height: visible ? childrenRect.height: 0 visible: Cura.MachineManager.hasMaterials Label @@ -246,8 +246,8 @@ Item text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : "" tooltip: text - height: UM.Theme.getSize("print_setup_big_item").height width: selectors.controlWidth + height: UM.Theme.getSize("print_setup_big_item").height style: UM.Theme.styles.print_setup_header_button activeFocusOnPress: true @@ -260,7 +260,7 @@ Item Row { - height: UM.Theme.getSize("print_setup_big_item").height + height: visible ? childrenRect.height: 0 visible: Cura.MachineManager.hasVariants Label @@ -279,7 +279,6 @@ Item id: variantSelection text: Cura.MachineManager.activeVariantName tooltip: Cura.MachineManager.activeVariantName - height: UM.Theme.getSize("print_setup_big_item").height width: selectors.controlWidth style: UM.Theme.styles.print_setup_header_button @@ -292,7 +291,7 @@ Item Row { id: warnings - height: UM.Theme.getSize("print_setup_big_item").height + height: visible ? childrenRect.height : 0 visible: buildplateCompatibilityError || buildplateCompatibilityWarning property bool buildplateCompatibilityError: !Cura.MachineManager.variantBuildplateCompatible && !Cura.MachineManager.variantBuildplateUsable diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 3b54b00911..a942ef9149 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -442,7 +442,6 @@ "print_setup_widget": [38.0, 30.0], "print_setup_mode_toggle": [0.0, 2.0], - "print_setup_item": [0.0, 2.0], "print_setup_extruder_box": [0.0, 6.0], "print_setup_slider_groove": [0.16, 0.16], "print_setup_slider_handle": [1.0, 1.0],