From 781ab5fdca2a8166ddcbecfa17f63b79d139dc85 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Tue, 22 Sep 2015 15:37:46 +0200 Subject: [PATCH] finetuning of the inactive states contributes to: issue CURA-184 --- resources/qml/SaveButton.qml | 9 ++++++--- resources/themes/cura/styles.qml | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index da3ea5560d..1f426c4f98 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -194,10 +194,13 @@ Rectangle { style: ButtonStyle { background: Rectangle { - opacity: control.enabled ? 1.0 : 0.5 + //opacity: control.enabled ? 1.0 : 0.5 //Behavior on opacity { NumberAnimation { duration: 50; } } color: { - if(control.enabled && control.hovered) { + if(!control.enabled){ + return UM.Theme.colors.button; + } + else if(control.enabled && control.hovered) { return UM.Theme.colors.load_save_button_hover } else { return UM.Theme.colors.load_save_button @@ -221,7 +224,7 @@ Rectangle { } Label { id: actualLabel - opacity: control.enabled ? 1.0 : 0.5 + opacity: control.enabled ? 1.0 : 0.4 //Behavior on opacity { NumberAnimation { duration: 50; } } anchors.centerIn: parent color: UM.Theme.colors.load_save_button_text diff --git a/resources/themes/cura/styles.qml b/resources/themes/cura/styles.qml index 7838225436..027ef72050 100644 --- a/resources/themes/cura/styles.qml +++ b/resources/themes/cura/styles.qml @@ -156,7 +156,7 @@ QtObject { Label { id: tool_button_arrow - opacity: !control.enabled ? 0.6 : 1.0 + opacity: !control.enabled ? 0.4 : 1.0 anchors.right: parent.right; anchors.rightMargin: (UM.Theme.sizes.button.width - UM.Theme.sizes.button_icon.width - tool_button_arrow.width) / 2 anchors.verticalCenter: parent.verticalCenter; @@ -171,7 +171,7 @@ QtObject { label: Item { Image { anchors.centerIn: parent; - opacity: !control.enabled ? 0.6 : 1.0 + opacity: !control.enabled ? 0.4 : 1.0 source: control.iconSource; width: UM.Theme.sizes.button_icon.width; height: UM.Theme.sizes.button_icon.height;