Skip to content

Commit dd45238

Browse files
committed
[ui] NodeActions : Fix ugly color on submitted nodes
1 parent efb53a6 commit dd45238

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

meshroom/ui/qml/Controls/NodeActions.qml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,13 @@ Item {
213213
ToolTip.delay: 1000
214214
visible: actionHeader.computeButtonState != NodeActions.ButtonState.DELETABLE
215215
enabled: actionHeader.computeButtonState % 2 == 1 // Launchable & Stoppable
216+
// Icon color
217+
textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text)
218+
// Background color
216219
background: Rectangle {
217220
color: {
218-
if (!computeButton.enabled) {
219-
if (actionHeader.nodeSubmitted)
220-
return Qt.darker(Colors.statusColors["SUBMITTED"], 1.2)
221+
if (!computeButton.enabled)
221222
return activePalette.button
222-
}
223223
if (actionHeader.computeButtonState == NodeActions.ButtonState.STOPPABLE)
224224
return computeButton.hovered ? Colors.orange : Qt.darker(Colors.orange, 1.3)
225225
return computeButton.hovered ? activePalette.highlight : activePalette.button
@@ -275,13 +275,13 @@ Item {
275275
ToolTip.delay: 1000
276276
visible: root.uigraph ? root.uigraph.canSubmit : false
277277
enabled: actionHeader.submitButtonState != NodeActions.ButtonState.DISABLED
278+
// Icon color
279+
textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text)
280+
// Background color
278281
background: Rectangle {
279282
color: {
280-
if (!submitButton.enabled) {
281-
if (actionHeader.nodeSubmitted)
282-
return Qt.darker(Colors.statusColors["SUBMITTED"], 1.2)
283+
if (!submitButton.enabled)
283284
return activePalette.button
284-
}
285285
return submitButton.hovered ? activePalette.highlight : activePalette.button
286286
}
287287
opacity: submitButton.hovered ? 1 : root._opacity

meshroom/ui/qml/MaterialIcons/MaterialToolButton.qml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ ToolButton {
1414
font.pointSize: 13
1515
ToolTip.visible: ToolTip.text && hovered
1616
ToolTip.delay: 100
17+
18+
property color textColor: checked ? palette.highlight : palette.text
19+
1720
Component.onCompleted: {
18-
contentItem.color = Qt.binding(function() { return checked ? palette.highlight : palette.text })
21+
contentItem.color = Qt.binding(function() { return textColor })
1922
}
23+
2024
background: Rectangle {
2125
color: {
2226
if (enabled && (pressed || checked || hovered)) {

0 commit comments

Comments
 (0)