Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions meshroom/ui/qml/Controls/NodeActions.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion meshroom/ui/qml/MaterialIcons/MaterialToolButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down