From a5da1b8ec8b8d452053865395dd2ef28afaf1e8f Mon Sep 17 00:00:00 2001 From: Alice Sonolet Date: Fri, 7 Nov 2025 00:41:29 +0100 Subject: [PATCH] [ui] NodeActions : Fix ugly color on submitted nodes --- meshroom/ui/qml/Controls/NodeActions.qml | 16 ++++++++-------- .../ui/qml/MaterialIcons/MaterialToolButton.qml | 6 +++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/meshroom/ui/qml/Controls/NodeActions.qml b/meshroom/ui/qml/Controls/NodeActions.qml index 26c199b988..592cf930ac 100644 --- a/meshroom/ui/qml/Controls/NodeActions.qml +++ b/meshroom/ui/qml/Controls/NodeActions.qml @@ -210,13 +210,13 @@ Item { ToolTip.delay: 1000 visible: actionHeader.computeButtonState != NodeActions.ButtonState.DELETABLE enabled: actionHeader.computeButtonState % 2 == 1 // Launchable & Stoppable + // Icon color + textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text) + // Background color background: Rectangle { color: { - if (!computeButton.enabled) { - if (actionHeader.nodeSubmitted) - return Qt.darker(Colors.statusColors["SUBMITTED"], 1.2) + if (!computeButton.enabled) return activePalette.button - } if (actionHeader.computeButtonState == NodeActions.ButtonState.STOPPABLE) return computeButton.hovered ? Colors.orange : Qt.darker(Colors.orange, 1.3) return computeButton.hovered ? activePalette.highlight : activePalette.button @@ -272,13 +272,13 @@ Item { ToolTip.delay: 1000 visible: root.uigraph ? root.uigraph.canSubmit : false enabled: actionHeader.submitButtonState != NodeActions.ButtonState.DISABLED + // Icon color + textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text) + // Background color background: Rectangle { color: { - if (!submitButton.enabled) { - if (actionHeader.nodeSubmitted) - return Qt.darker(Colors.statusColors["SUBMITTED"], 1.2) + if (!submitButton.enabled) return activePalette.button - } return submitButton.hovered ? activePalette.highlight : activePalette.button } opacity: submitButton.hovered ? 1 : root._opacity diff --git a/meshroom/ui/qml/MaterialIcons/MaterialToolButton.qml b/meshroom/ui/qml/MaterialIcons/MaterialToolButton.qml index 8378b20ee9..7ead423c1d 100644 --- a/meshroom/ui/qml/MaterialIcons/MaterialToolButton.qml +++ b/meshroom/ui/qml/MaterialIcons/MaterialToolButton.qml @@ -14,9 +14,13 @@ ToolButton { font.pointSize: 13 ToolTip.visible: ToolTip.text && hovered ToolTip.delay: 100 + + property color textColor: checked ? palette.highlight : palette.text + Component.onCompleted: { - contentItem.color = Qt.binding(function() { return checked ? palette.highlight : palette.text }) + contentItem.color = Qt.binding(function() { return textColor }) } + background: Rectangle { color: { if (enabled && (pressed || checked || hovered)) {