Skip to content

Commit a5da1b8

Browse files
Alxiicecbentejac
authored andcommitted
[ui] NodeActions : Fix ugly color on submitted nodes
1 parent 4585522 commit a5da1b8

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
@@ -210,13 +210,13 @@ Item {
210210
ToolTip.delay: 1000
211211
visible: actionHeader.computeButtonState != NodeActions.ButtonState.DELETABLE
212212
enabled: actionHeader.computeButtonState % 2 == 1 // Launchable & Stoppable
213+
// Icon color
214+
textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text)
215+
// Background color
213216
background: Rectangle {
214217
color: {
215-
if (!computeButton.enabled) {
216-
if (actionHeader.nodeSubmitted)
217-
return Qt.darker(Colors.statusColors["SUBMITTED"], 1.2)
218+
if (!computeButton.enabled)
218219
return activePalette.button
219-
}
220220
if (actionHeader.computeButtonState == NodeActions.ButtonState.STOPPABLE)
221221
return computeButton.hovered ? Colors.orange : Qt.darker(Colors.orange, 1.3)
222222
return computeButton.hovered ? activePalette.highlight : activePalette.button
@@ -272,13 +272,13 @@ Item {
272272
ToolTip.delay: 1000
273273
visible: root.uigraph ? root.uigraph.canSubmit : false
274274
enabled: actionHeader.submitButtonState != NodeActions.ButtonState.DISABLED
275+
// Icon color
276+
textColor: (!enabled && actionHeader.nodeSubmitted) ? Colors.statusColors["SUBMITTED"] : (checked ? palette.highlight : palette.text)
277+
// Background color
275278
background: Rectangle {
276279
color: {
277-
if (!submitButton.enabled) {
278-
if (actionHeader.nodeSubmitted)
279-
return Qt.darker(Colors.statusColors["SUBMITTED"], 1.2)
280+
if (!submitButton.enabled)
280281
return activePalette.button
281-
}
282282
return submitButton.hovered ? activePalette.highlight : activePalette.button
283283
}
284284
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)