Fix SignIn circle buttons colors

2019-07-24 18:41:40 -04:00
parent 607d1d8f5a
commit b6290ad3c9
4 changed files with 15 additions and 7 deletions
--- a/src/qml/Base/HBaseButton.qml
+++ b/src/qml/Base/HBaseButton.qml
@@ -25,12 +25,11 @@ Button {

    background: Rectangle {
        id: buttonBackground
-        color: Qt.lighter(
-            backgroundColor,
-            ! enabled ? 0.7 :
-            checked ? (checkedLightens ? 1.3 : 0.7) :
-            1.0
-        )
+        color:
+            enabled ?
+            (checked ?
+             theme.controls.button.checkedBackground : backgroundColor) :
+            theme.controls.button.disabledBackground
        radius: circle ? height : 0

        Behavior on color { HColorAnimation { factor: 0.5 } }
--- a/src/qml/Pages/SignIn.qml
+++ b/src/qml/Pages/SignIn.qml
@@ -50,6 +50,7 @@ Item {
                    iconName: modelData
                    circle: true
                    checked: loginWith == modelData
+                    enabled: modelData == "username"
                    autoExclusive: true
                    checkedLightens: true
                    onClicked: loginWith = modelData