From 5a5adb71cd159c2e7b7204aa40b42472db4d9995 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 26 Oct 2018 16:16:33 +0200 Subject: [PATCH] Make the height of the Print setup selector themable. Contributes to CURA-5772. --- plugins/PrepareStage/PrepareMenu.qml | 4 ++-- resources/qml/PrintSetupSelector.qml | 2 +- resources/themes/cura-light/theme.json | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/PrepareStage/PrepareMenu.qml b/plugins/PrepareStage/PrepareMenu.qml index f08de9d317..27d068e909 100644 --- a/plugins/PrepareStage/PrepareMenu.qml +++ b/plugins/PrepareStage/PrepareMenu.qml @@ -61,12 +61,12 @@ Item Cura.CustomConfigurationSelector { - width: UM.Theme.getSize("sidebar").width + width: UM.Theme.getSize("configuration_selector_widget").width } Cura.PrintSetupSelector { - width: UM.Theme.getSize("sidebar").width + width: UM.Theme.getSize("print_setup_widget").width onShowTooltip: prepareMenu.showTooltip(item, location, text) onHideTooltip: prepareMenu.hideTooltip() } diff --git a/resources/qml/PrintSetupSelector.qml b/resources/qml/PrintSetupSelector.qml index e4cb852d89..d9b2337c96 100644 --- a/resources/qml/PrintSetupSelector.qml +++ b/resources/qml/PrintSetupSelector.qml @@ -189,7 +189,7 @@ Rectangle anchors.topMargin: UM.Theme.getSize("sidebar_margin").height anchors.left: parent.left anchors.right: parent.right - height: 500 + height: UM.Theme.getSize("print_setup_widget").height // We load both of them at once (instead of using a loader) because the advanced sidebar can take // quite some time to load. So in this case we sacrifice memory for speed. diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 6a83c2c566..38d4f5372f 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -355,6 +355,9 @@ "account_button": [12, 3], + "print_setup_widget": [35.0, 42.0], + "configuration_selector_widget": [35.0, 0.0], + "views_selector": [0.0, 4.0], "default_lining": [0.08, 0.08],