From 045f1ce259bf59025caa9a95de1ad4041fce3a64 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 22 Sep 2017 15:52:44 +0200 Subject: [PATCH] update print button dropdown color and hover color --- resources/qml/SaveButton.qml | 18 +++++++++--------- resources/themes/cura-light/theme.json | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 2b7930793f..0a792c8bba 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -305,22 +305,22 @@ Item { if(!control.enabled) return UM.Theme.getColor("action_button_disabled_border"); 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) - return UM.Theme.getColor("action_button_hovered_border"); + return UM.Theme.getColor("print_button_ready_hovered_border"); else - return UM.Theme.getColor("action_button_border"); + return UM.Theme.getColor("print_button_ready_border"); } color: { if(!control.enabled) return UM.Theme.getColor("action_button_disabled"); else if(control.pressed) - return UM.Theme.getColor("action_button_active"); + return UM.Theme.getColor("print_button_ready_pressed"); else if(control.hovered) - return UM.Theme.getColor("action_button_hovered"); + return UM.Theme.getColor("print_button_ready_hovered"); else - return UM.Theme.getColor("action_button"); + return UM.Theme.getColor("print_button_ready"); } Behavior on color { ColorAnimation { duration: 50; } } anchors.left: parent.left @@ -340,11 +340,11 @@ Item { if(!control.enabled) return UM.Theme.getColor("action_button_disabled_text"); else if(control.pressed) - return UM.Theme.getColor("action_button_active_text"); + return UM.Theme.getColor("print_button_ready_text"); else if(control.hovered) - return UM.Theme.getColor("action_button_hovered_text"); + return UM.Theme.getColor("print_button_ready_text"); else - return UM.Theme.getColor("action_button_text"); + return UM.Theme.getColor("print_button_ready_text"); } source: UM.Theme.getIcon("arrow_bottom"); } diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 8624760e3a..62e22e4f0d 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -132,10 +132,10 @@ "print_button_ready": [12, 169, 227, 255], "print_button_ready_border": [12, 169, 227, 255], "print_button_ready_text": [255, 255, 255, 255], - "print_button_ready_hovered": [12, 169, 255, 255], - "print_button_ready_hovered_border": [12, 169, 227, 255], - "print_button_ready_pressed": [12, 169, 220, 255], - "print_button_ready_pressed_border": [12, 169, 227, 255], + "print_button_ready_hovered": [30, 186, 245, 243], + "print_button_ready_hovered_border": [30, 186, 245, 243], + "print_button_ready_pressed": [30, 186, 245, 243], + "print_button_ready_pressed_border": [30, 186, 245, 243], "scrollbar_background": [255, 255, 255, 255], "scrollbar_handle": [24, 41, 77, 255],