Fixes from main repo

This commit is contained in:
JaKooLit 2024-06-26 21:41:53 +09:00
parent a819676709
commit 286f8d3c8f
3 changed files with 8 additions and 4 deletions

View File

@ -98,7 +98,7 @@ Column {
contentItem: Text { contentItem: Text {
text: model.name text: model.name
font.pointSize: root.font.pointSize * 0.8 font.pointSize: root.font.pointSize * 0.8
font.capitalization: Font.Capitalize font.capitalization: Font.AllLowercase
color: selectUser.highlightedIndex === index ? root.palette.highlight.hslLightness >= 0.7 ? "#444" : "white" : root.palette.window.hslLightness >= 0.8 ? root.palette.highlight.hslLightness >= 0.8 ? "#444" : root.palette.highlight : "white" color: selectUser.highlightedIndex === index ? root.palette.highlight.hslLightness >= 0.7 ? "#444" : "white" : root.palette.window.hslLightness >= 0.8 ? root.palette.highlight.hslLightness >= 0.8 ? "#444" : root.palette.highlight : "white"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -211,7 +211,7 @@ Column {
id: username id: username
text: config.ForceLastUser == "true" ? selectUser.currentText : null text: config.ForceLastUser == "true" ? selectUser.currentText : null
font.bold: true font.bold: true
font.capitalization: config.AllowBadUsernames == "false" ? Font.Capitalize : Font.MixedCase font.capitalization: config.AllowBadUsernames == "false" ? Font.AllLowercase : Font.MixedCase
anchors.centerIn: parent anchors.centerIn: parent
height: root.font.pointSize * 3 height: root.font.pointSize * 3
width: parent.width width: parent.width
@ -245,7 +245,7 @@ Column {
} }
PropertyChanges { PropertyChanges {
target: username target: username
color: root.palette.highlight color: root.palette.highlightedText
} }
} }
] ]

View File

@ -21,6 +21,7 @@ Pane {
padding: config.ScreenPadding padding: config.ScreenPadding
palette.button: "transparent" palette.button: "transparent"
palette.highlight: config.AccentColor palette.highlight: config.AccentColor
palette.highlightedText: config.OverrideTextFieldColor !== "" ? config.OverrideTextFieldColor : root.palette.highlight
palette.text: config.MainColor palette.text: config.MainColor
palette.buttonText: config.MainColor palette.buttonText: config.MainColor
palette.window: config.BackgroundColor palette.window: config.BackgroundColor

View File

@ -46,6 +46,9 @@ MainColor="#7287fd"
AccentColor="#7287fd" AccentColor="#7287fd"
## Used for elements in focus/hover/pressed. Should be contrasting to the background and the MainColor to achieve the best effect. ## Used for elements in focus/hover/pressed. Should be contrasting to the background and the MainColor to achieve the best effect.
OverrideTextFieldColor=""
## The text color of the username & password when focused/pressed may become difficult to read depending on your color choices. Use this option to set it independently for legibility.
BackgroundColor="#030404" BackgroundColor="#030404"
## Used for the user and session selection background as well as for ScreenPadding and FormBackground when either is true. If PartialBlur and FormBackground are both enabled this color will blend with the blur effect. ## Used for the user and session selection background as well as for ScreenPadding and FormBackground when either is true. If PartialBlur and FormBackground are both enabled this color will blend with the blur effect.
@ -104,7 +107,7 @@ AllowEmptyPassword="false"
## Enable login for users without a password. This is discouraged. Makes the login button always enabled. ## Enable login for users without a password. This is discouraged. Makes the login button always enabled.
AllowBadUsernames="false" AllowBadUsernames="false"
## Do not change this! Uppercase letters are generally not allowed in usernames. This option is only for systems that differ from this standard! Also shows username as is instead of capitalized. ## Do not change this! Uppercase letters are generally not allowed in usernames. This option is only for systems that differ from this standard!