GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into PP-108_Improved_support_settings

Browse Source
This commit is contained in:
p.kuiper 2022-06-03 10:31:25 +02:00
commit e035c082fb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/3MFWriter/ThreeMFWriter.py
View File

@ -276,6 +276,7 @@ class ThreeMFWriter(MeshWriter):
title=catalog.i18nc("@info:title", "Failed to save material package information"), title=catalog.i18nc("@info:title", "Failed to save material package information"),
message_type=Message.MessageType.WARNING) message_type=Message.MessageType.WARNING)
message.show() message.show()
continue
if package_data.get("is_bundled"): if package_data.get("is_bundled"):
continue continue

4
resources/qml/MachineSettings/GcodeTextArea.qml
View File

@ -67,6 +67,8 @@ UM.TooltipArea
font: UM.Theme.getFont("fixed") font: UM.Theme.getFont("fixed")
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
selectionColor: UM.Theme.getColor("text_selection")
selectedTextColor: UM.Theme.getColor("text")
wrapMode: TextEdit.NoWrap wrapMode: TextEdit.NoWrap
onActiveFocusChanged: onActiveFocusChanged:
@ -91,7 +93,7 @@ UM.TooltipArea
} }
if (gcodeTextArea.hovered || gcodeTextArea.activeFocus) 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") return UM.Theme.getColor("border_field_light")
} }