From 8de5e1e5b9db9a916d550401befd5ff75a90bacb Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Wed, 25 Aug 2021 17:13:43 +0200 Subject: [PATCH 1/2] Account for the width of the arrow in the Extruders row Although the ExpandablePopup already sets the anchors of the `headerItem` to account for the arrow icon on the right side, the ConfigurationMenu's extruder row was ignoring it, thus making the elided text of the last extruder to overlap with the arrow icon a bit. This commit fixes that by explicitly accounting for the width of the arrow in the extruders row. **Note:** if the Cura window gets resized way too much, the extruder icons will still overlap with the arrow, since there is no space to fit everything. CURA-8496 --- resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 1a04b85fcb..e9c706334a 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -40,7 +40,10 @@ Cura.ExpandablePopup // Horizontal list that shows the extruders and their materials RowLayout { - anchors.fill: parent + anchors.top: parent.top + anchors.bottom: parent.bottom + anchors.left: parent.left + width: parent.width - UM.Theme.getSize("standard_arrow").width visible: Cura.MachineManager.activeMachine ? Cura.MachineManager.activeMachine.hasMaterials : false Repeater { From 183fbfad419d8493cd361b3135aee35c542dbc4c Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 30 Aug 2021 11:09:55 +0200 Subject: [PATCH 2/2] Disable save to DF if the textfield is in an invalid state CURA-8502 --- plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml index 30e3513019..d8ae78d96d 100644 --- a/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml +++ b/plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml @@ -200,7 +200,7 @@ Item anchors.bottom: parent.bottom anchors.right: parent.right text: "Save" - enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text.length >= 1 + enabled: (asProjectCheckbox.checked || asSlicedCheckbox.checked) && dfFilenameTextfield.text.length >= 1 && dfFilenameTextfield.state !== 'invalid' onClicked: {