From b589920f53a7192bd620e55e7d4ec87d22bbde7d Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 14 Nov 2018 13:55:39 +0100 Subject: [PATCH] Move a few hardcoded sizes to the theme CURA-5785 --- plugins/PrepareStage/PrepareMenu.qml | 9 ++++----- resources/themes/cura-light/theme.json | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index 78f9ced1e7..9507d786b2 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -53,9 +53,8 @@ Item { id: machineSelection z: openFileButtonBackground.z - 1 - - Layout.minimumWidth: 240 - Layout.maximumWidth: 240 + Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width + Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width Layout.fillWidth: true Layout.fillHeight: true } @@ -90,8 +89,8 @@ Item onShowTooltip: prepareMenu.showTooltip(item, location, text) onHideTooltip: prepareMenu.hideTooltip() - Layout.minimumWidth: 460 - Layout.maximumWidth: 460 + Layout.minimumWidth: UM.Theme.getSize("print_setup_widget").width + Layout.maximumWidth: UM.Theme.getSize("print_setup_widget").width Layout.fillWidth: true Layout.fillHeight: true } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index a33ff87042..a36940641e 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -374,7 +374,7 @@ "account_button": [12, 3], - "print_setup_widget": [35.0, 42.0], + "print_setup_widget": [30.0, 42.0], "print_setup_mode_toggle": [0.0, 2.0], "print_setup_item": [0.0, 2.0], "print_setup_extruder_box": [0.0, 6.0], @@ -386,7 +386,7 @@ "action_panel_information_widget": [20.0, 0.0], "action_panel_button": [15.0, 3.0], - "machine_selector_widget": [28.0, 4.5], + "machine_selector_widget": [16.0, 4.5], "views_selector": [0.0, 4.0],