3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make button text and icons change colour on active and hover

Browse source 
Just like the background colour, the foreground colour may now also change.

Contributes to issue CURA-4148.
This commit is contained in:
Ghostkeeper 2017-08-21 14:43:35 +02:00
parent d73bbabda9
commit f88ffee638
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

40
resources/themes/cura/styles.qml
View file

@ -301,7 +301,25 @@ QtObject {
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
visible: control.menu != null; 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") source: Theme.getIcon("arrow_bottom")
} }
} }
@ -314,7 +332,25 @@ QtObject {
source: control.iconSource; source: control.iconSource;
width: Theme.getSize("button_icon").width; width: Theme.getSize("button_icon").width;
height: Theme.getSize("button_icon").height; 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") sourceSize: Theme.getSize("button_icon")
} }