From 00cbee698532388314356936a3e4dbb2356bc41c Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Thu, 2 Jun 2022 17:08:25 +0200 Subject: [PATCH 1/2] Add missing continue, this was throwing errors due to it trying to packagedata.get("isbundled") on a None value. CURA-8610 --- plugins/3MFWriter/ThreeMFWriter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index d9c4ee9e9a..d7d1380f9b 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -276,6 +276,7 @@ class ThreeMFWriter(MeshWriter): title=catalog.i18nc("@info:title", "Failed to save material package information"), message_type=Message.MessageType.WARNING) message.show() + continue if package_data.get("is_bundled"): continue From 979c436b6cf16cb09badc63a3ae375038a14722b Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 3 Jun 2022 10:30:00 +0200 Subject: [PATCH 2/2] Make text area selection use theme colours Also fix the highlight colour of the border. The highlight colour was changed in a later design but it was not changed here yet. Without a theme colour it's going to use the system colours for the highlighting of text, which may be a very light grey that matches the background, making it impossible to see what part of the text is selected. Hopefully fixes issue #12286. --- resources/qml/MachineSettings/GcodeTextArea.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/qml/MachineSettings/GcodeTextArea.qml b/resources/qml/MachineSettings/GcodeTextArea.qml index 7791e169c2..d4bc58cdc4 100644 --- a/resources/qml/MachineSettings/GcodeTextArea.qml +++ b/resources/qml/MachineSettings/GcodeTextArea.qml @@ -67,6 +67,8 @@ UM.TooltipArea font: UM.Theme.getFont("fixed") renderType: Text.NativeRendering color: UM.Theme.getColor("text") + selectionColor: UM.Theme.getColor("text_selection") + selectedTextColor: UM.Theme.getColor("text") wrapMode: TextEdit.NoWrap onActiveFocusChanged: @@ -91,7 +93,7 @@ UM.TooltipArea } if (gcodeTextArea.hovered || gcodeTextArea.activeFocus) { - return UM.Theme.getColor("border_main") + return UM.Theme.getColor("text_field_border_active") } return UM.Theme.getColor("border_field_light") }