From 37a4986406e0d9e6b0de800fd764ee6ef034147b Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 7 Mar 2022 16:17:03 +0100 Subject: [PATCH 1/4] Reduce width of preferences dialog page selection buttons. Reduce width of profiles list and printers list. CURA-9008 --- resources/themes/cura-light/theme.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 4d89c37609..877f0a1f91 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -637,6 +637,8 @@ "banner_icon_size": [2.0, 2.0], - "marketplace_large_icon": [4.0, 4.0] + "marketplace_large_icon": [4.0, 4.0], + + "preferences_page_list": [8.0, 2.0] } } From a49aa6502cee8c25aa3bb8614266058e8162ff9b Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 7 Mar 2022 16:56:26 +0100 Subject: [PATCH 2/4] Set material and nozzle selection menus to appear at bottom of button like drop downs. CURA-9004 --- .../qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index f3cef1a819..706430988d 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -285,10 +285,11 @@ Item Cura.MaterialMenu { id: materialsMenu + width: materialSelection.width extruderIndex: Cura.ExtruderManager.activeExtruderIndex updateModels: materialSelection.visible } - onClicked: materialsMenu.popup() + onClicked: materialsMenu.popup(0, height) } Item @@ -341,8 +342,9 @@ Item { id: nozzlesMenu extruderIndex: Cura.ExtruderManager.activeExtruderIndex + width: variantSelection.width } - onClicked: nozzlesMenu.popup() + onClicked: nozzlesMenu.popup(0, height) } } From 59158db34b2c02ed3a43c36650fbb2db1c996ea8 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 7 Mar 2022 17:07:14 +0100 Subject: [PATCH 3/4] Lining at the bottom of UnderlineBackground and at the top of the menu give a double width lining. Moved the menu up slightly so lining of UnderlineBackground is hidden. CURA-9004 --- resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 706430988d..4b2b84d39e 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -289,7 +289,7 @@ Item extruderIndex: Cura.ExtruderManager.activeExtruderIndex updateModels: materialSelection.visible } - onClicked: materialsMenu.popup(0, height) + onClicked: materialsMenu.popup(0, height - UM.Theme.getSize("default_lining").height) } Item @@ -344,7 +344,7 @@ Item extruderIndex: Cura.ExtruderManager.activeExtruderIndex width: variantSelection.width } - onClicked: nozzlesMenu.popup(0, height) + onClicked: nozzlesMenu.popup(0, height - UM.Theme.getSize("default_lining").height) } } From 912db08b234382b1cc9280f9629e715512663529 Mon Sep 17 00:00:00 2001 From: casper Date: Tue, 8 Mar 2022 09:11:49 +0100 Subject: [PATCH 4/4] Let height of preferences_page_list themes value set height of list item CURA-9008 --- resources/themes/cura-light/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 877f0a1f91..2f14a5be78 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -639,6 +639,6 @@ "marketplace_large_icon": [4.0, 4.0], - "preferences_page_list": [8.0, 2.0] + "preferences_page_list_item": [8.0, 2.0] } }