update print button dropdown color and hover color

This commit is contained in:
ChrisTerBeke 2017-09-22 15:52:44 +02:00
parent eb39d857e9
commit 045f1ce259
2 changed files with 13 additions and 13 deletions

View File

@ -305,22 +305,22 @@ Item {
if(!control.enabled) if(!control.enabled)
return UM.Theme.getColor("action_button_disabled_border"); return UM.Theme.getColor("action_button_disabled_border");
else if(control.pressed) else if(control.pressed)
return UM.Theme.getColor("action_button_active_border"); return UM.Theme.getColor("print_button_ready_pressed_border");
else if(control.hovered) else if(control.hovered)
return UM.Theme.getColor("action_button_hovered_border"); return UM.Theme.getColor("print_button_ready_hovered_border");
else else
return UM.Theme.getColor("action_button_border"); return UM.Theme.getColor("print_button_ready_border");
} }
color: color:
{ {
if(!control.enabled) if(!control.enabled)
return UM.Theme.getColor("action_button_disabled"); return UM.Theme.getColor("action_button_disabled");
else if(control.pressed) else if(control.pressed)
return UM.Theme.getColor("action_button_active"); return UM.Theme.getColor("print_button_ready_pressed");
else if(control.hovered) else if(control.hovered)
return UM.Theme.getColor("action_button_hovered"); return UM.Theme.getColor("print_button_ready_hovered");
else else
return UM.Theme.getColor("action_button"); return UM.Theme.getColor("print_button_ready");
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
anchors.left: parent.left anchors.left: parent.left
@ -340,11 +340,11 @@ Item {
if(!control.enabled) if(!control.enabled)
return UM.Theme.getColor("action_button_disabled_text"); return UM.Theme.getColor("action_button_disabled_text");
else if(control.pressed) else if(control.pressed)
return UM.Theme.getColor("action_button_active_text"); return UM.Theme.getColor("print_button_ready_text");
else if(control.hovered) else if(control.hovered)
return UM.Theme.getColor("action_button_hovered_text"); return UM.Theme.getColor("print_button_ready_text");
else else
return UM.Theme.getColor("action_button_text"); return UM.Theme.getColor("print_button_ready_text");
} }
source: UM.Theme.getIcon("arrow_bottom"); source: UM.Theme.getIcon("arrow_bottom");
} }

View File

@ -132,10 +132,10 @@
"print_button_ready": [12, 169, 227, 255], "print_button_ready": [12, 169, 227, 255],
"print_button_ready_border": [12, 169, 227, 255], "print_button_ready_border": [12, 169, 227, 255],
"print_button_ready_text": [255, 255, 255, 255], "print_button_ready_text": [255, 255, 255, 255],
"print_button_ready_hovered": [12, 169, 255, 255], "print_button_ready_hovered": [30, 186, 245, 243],
"print_button_ready_hovered_border": [12, 169, 227, 255], "print_button_ready_hovered_border": [30, 186, 245, 243],
"print_button_ready_pressed": [12, 169, 220, 255], "print_button_ready_pressed": [30, 186, 245, 243],
"print_button_ready_pressed_border": [12, 169, 227, 255], "print_button_ready_pressed_border": [30, 186, 245, 243],
"scrollbar_background": [255, 255, 255, 255], "scrollbar_background": [255, 255, 255, 255],
"scrollbar_handle": [24, 41, 77, 255], "scrollbar_handle": [24, 41, 77, 255],