Fix SignIn circle buttons colors

This commit is contained in:
miruka 2019-07-24 18:41:40 -04:00
parent 607d1d8f5a
commit b6290ad3c9
4 changed files with 15 additions and 7 deletions

View File

@ -68,6 +68,9 @@
- Prevent using the SendBox if no permission (power levels) - Prevent using the SendBox if no permission (power levels)
- Spinner when loading past room events, images or clicking buttons - Spinner when loading past room events, images or clicking buttons
- Theming - Theming
- Don't use user theme in debug mode
- Don't create additional lines in theme conversion (braces)
- Recursively merge default and user theme
- Distribute fonts - Distribute fonts
- preferredIconPack: accept multiple values - preferredIconPack: accept multiple values
- Find icon packs in user data dir - Find icon packs in user data dir

View File

@ -25,12 +25,11 @@ Button {
background: Rectangle { background: Rectangle {
id: buttonBackground id: buttonBackground
color: Qt.lighter( color:
backgroundColor, enabled ?
! enabled ? 0.7 : (checked ?
checked ? (checkedLightens ? 1.3 : 0.7) : theme.controls.button.checkedBackground : backgroundColor) :
1.0 theme.controls.button.disabledBackground
)
radius: circle ? height : 0 radius: circle ? height : 0
Behavior on color { HColorAnimation { factor: 0.5 } } Behavior on color { HColorAnimation { factor: 0.5 } }

View File

@ -50,6 +50,7 @@ Item {
iconName: modelData iconName: modelData
circle: true circle: true
checked: loginWith == modelData checked: loginWith == modelData
enabled: modelData == "username"
autoExclusive: true autoExclusive: true
checkedLightens: true checkedLightens: true
onClicked: loginWith = modelData onClicked: loginWith = modelData

View File

@ -76,7 +76,12 @@ controls:
color background: colors.strongBackground color background: colors.strongBackground
button: button:
color background: colors.inputBackground color background: colors.inputBackground
color disabledBackground:
hsluv(0, 0, colors.intensity * 2, Math.min(0.6, opacity))
color checkedBackground:
hsluv(0, 0, colors.intensity * 40, Math.min(0.6, opacity))
color hoveredOverlay: hsluv(0, 0, 100) color hoveredOverlay: hsluv(0, 0, 100)
color text: colors.text color text: colors.text
color disabledText: colors.dimmerText color disabledText: colors.dimmerText