From 286f8d3c8faa923686ca79a50c916bd47cdcefea Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Wed, 26 Jun 2024 21:41:53 +0900
Subject: [PATCH] Fixes from main repo

---
 Components/Input.qml | 6 +++---
 Main.qml             | 1 +
 theme.conf           | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Components/Input.qml b/Components/Input.qml
index b7b01a2..0ef2b9f 100644
--- a/Components/Input.qml
+++ b/Components/Input.qml
@@ -98,7 +98,7 @@ Column {
                 contentItem: Text {
                     text: model.name
                     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"
                     verticalAlignment: Text.AlignVCenter
                     horizontalAlignment: Text.AlignHCenter
@@ -211,7 +211,7 @@ Column {
             id: username
             text: config.ForceLastUser == "true" ? selectUser.currentText : null
             font.bold: true
-            font.capitalization: config.AllowBadUsernames == "false" ? Font.Capitalize : Font.MixedCase
+            font.capitalization: config.AllowBadUsernames == "false" ? Font.AllLowercase : Font.MixedCase
             anchors.centerIn: parent
             height: root.font.pointSize * 3
             width: parent.width
@@ -245,7 +245,7 @@ Column {
                     }
                     PropertyChanges {
                         target: username
-                        color: root.palette.highlight
+                        color: root.palette.highlightedText
                     }
                 }
             ]
diff --git a/Main.qml b/Main.qml
index 55fde60..4b34315 100644
--- a/Main.qml
+++ b/Main.qml
@@ -21,6 +21,7 @@ Pane {
     padding: config.ScreenPadding
     palette.button: "transparent"
     palette.highlight: config.AccentColor
+    palette.highlightedText: config.OverrideTextFieldColor !== "" ? config.OverrideTextFieldColor : root.palette.highlight
     palette.text: config.MainColor
     palette.buttonText: config.MainColor
     palette.window: config.BackgroundColor
diff --git a/theme.conf b/theme.conf
index b994463..e6c70b0 100644
--- a/theme.conf
+++ b/theme.conf
@@ -46,6 +46,9 @@ MainColor="#7287fd"
 AccentColor="#7287fd"
 ## 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"
 ## 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.
 
 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!