From f88ffee638a49cf970e368de6eb5138980c2a38d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 21 Aug 2017 14:43:35 +0200 Subject: [PATCH] Make button text and icons change colour on active and hover Just like the background colour, the foreground colour may now also change. Contributes to issue CURA-4148. --- resources/themes/cura/styles.qml | 40 ++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index d3069287da..cc9e16fda1 100755 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -301,7 +301,25 @@ QtObject { sourceSize.width: width sourceSize.height: width visible: control.menu != null; - color: Theme.getColor("button_text") + color: + { + if(control.checkable && control.checked && control.hovered) + { + return Theme.getColor("button_text_active_hover"); + } + else if(control.pressed || (control.checkable && control.checked)) + { + return Theme.getColor("button_text_active"); + } + else if(control.hovered) + { + return Theme.getColor("button_text_hover"); + } + else + { + return Theme.getColor("button_text"); + } + } source: Theme.getIcon("arrow_bottom") } } @@ -314,7 +332,25 @@ QtObject { source: control.iconSource; width: Theme.getSize("button_icon").width; height: Theme.getSize("button_icon").height; - color: Theme.getColor("button_text") + color: + { + if(control.checkable && control.checked && control.hovered) + { + return Theme.getColor("button_text_active_hover"); + } + else if(control.pressed || (control.checkable && control.checked)) + { + return Theme.getColor("button_text_active"); + } + else if(control.hovered) + { + return Theme.getColor("button_text_hover"); + } + else + { + return Theme.getColor("button_text"); + } + } sourceSize: Theme.getSize("button_icon") }