Browse Source

finetuning of the inactive states

contributes to: issue CURA-184
Tamara Hogenhout 9 years ago
parent
commit
781ab5fdca
2 changed files with 8 additions and 5 deletions
  1. 6 3
      resources/qml/SaveButton.qml
  2. 2 2
      resources/themes/cura/styles.qml

+ 6 - 3
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

+ 2 - 2
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;