From 62047d585fb1bb1a60bea4c9270225029fb8f3ab Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 10 Jun 2020 11:23:17 +0200 Subject: [PATCH 1/2] Convert RowLayout into Row in ConfigurationMenu CURA-7479 --- resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 9891fc1d69..64c7ef8b18 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -38,7 +38,7 @@ Cura.ExpandablePopup headerItem: Item { // Horizontal list that shows the extruders and their materials - RowLayout + Row { anchors.fill: parent Repeater @@ -46,8 +46,8 @@ Cura.ExpandablePopup model: extrudersModel delegate: Item { - Layout.fillWidth: true - Layout.fillHeight: true + width: Math.round(parent.width / extrudersModel.count) + height: parent.height // Extruder icon. Shows extruder index and has the same color as the active material. Cura.ExtruderIcon From df2c20f64757f55a7845ca4feb5a95e80c8497b5 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 10 Jun 2020 11:37:51 +0200 Subject: [PATCH 2/2] Convert back Row to RowLayout RowLayout is better for resizable interfaces CURA-7479 --- resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 64c7ef8b18..5d8414846b 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -38,7 +38,7 @@ Cura.ExpandablePopup headerItem: Item { // Horizontal list that shows the extruders and their materials - Row + RowLayout { anchors.fill: parent Repeater @@ -46,8 +46,8 @@ Cura.ExpandablePopup model: extrudersModel delegate: Item { - width: Math.round(parent.width / extrudersModel.count) - height: parent.height + Layout.preferredWidth: Math.round(parent.width / extrudersModel.count) + Layout.fillHeight: true // Extruder icon. Shows extruder index and has the same color as the active material. Cura.ExtruderIcon