LoginWindow fixes

Author: pandinocoder

Intersect.Client.Core/Interface/Menu/LoginWindow.cs

@@ -1,5 +1,7 @@
 using Intersect.Client.Core;
 using Intersect.Client.Framework.File_Management;
+using Intersect.Client.Framework.Graphics;
+using Intersect.Client.Framework.Gwen;
 using Intersect.Client.Framework.Gwen.Control;
 using Intersect.Client.Framework.Gwen.Control.EventArguments;
 using Intersect.Client.Framework.Input;
@@ -14,58 +16,114 @@ namespace Intersect.Client.Interface.Menu;
 
 public partial class LoginWindow : ImagePanel, IMainMenuWindow
 {
+    private readonly GameFont? _defaultFont;
+
     private readonly MainMenu _mainMenu;
-    private readonly TextBox _txtUsername;
-    private readonly TextBoxPassword _txtPassword;
-    private readonly LabeledCheckBox _chkSavePass;
+    private readonly ImagePanel _usernamePanel;
+    private readonly Label _usernameLabel;
+    private readonly TextBox _usernameInput;
+    private readonly ImagePanel _passwordPanel;
+    private readonly TextBoxPassword _passwordInput;
+    private readonly LabeledCheckBox _savePasswordCheckbox;
     private readonly Button _btnForgotPassword;
     private readonly Button _btnLogin;
     private bool _useSavedPass;
     private string _savedPass = string.Empty;
+    private readonly Label _passwordLabel;
 
     //Init
     public LoginWindow(Canvas parent, MainMenu mainMenu) : base(parent, "LoginWindow")
     {
         //Assign References
         _mainMenu = mainMenu;
 
+        _defaultFont = GameContentManager.Current.GetFont(name: "sourcesansproblack", 10);
+
         //Menu Header
         _ = new Label(this, "LoginHeader")
         {
             Text = Strings.LoginWindow.Title,
         };
 
         //Login Username Label/Textbox
-        var usernameBackground = new ImagePanel(this, "UsernamePanel");
-        _ = new Label(usernameBackground, "UsernameLabel")
+        _usernamePanel = new ImagePanel(this, nameof(_usernamePanel))
+        {
+            X = 14,
+            Y = 61,
+            Width = 308,
+            Height = 22,
+            Margin = new Margin(14, 0, 0, 0),
+        };
+        _usernameLabel = new Label(_usernamePanel, nameof(_usernameLabel))
         {
+            AutoSizeToContents = false,
+            Dock = Pos.Left,
+            Font = _defaultFont,
             Text = Strings.LoginWindow.Username,
+            TextAlign = Pos.Right | Pos.CenterV,
+            TextPadding = new Padding(0, 0, 10, 0),
+        };
+        _usernameInput = new TextBox(_usernamePanel, nameof(_usernameInput))
+        {
+            Dock = Pos.Fill,
+            Font = _defaultFont,
+            TextAlign = Pos.Left | Pos.CenterV,
+            TextPadding = new Padding(2, 0),
         };
-        _txtUsername = new TextBox(usernameBackground, "UsernameField");
-        _txtUsername.SubmitPressed += (s, e) => TryLogin();
-        _txtUsername.Clicked += _txtUsername_Clicked;
+        _usernameInput.SubmitPressed += (s, e) => TryLogin();
+        _usernameInput.Clicked += UsernameInputClicked;
+        _usernameInput.SetSound(TextBox.Sounds.AddText, "octave-tap-resonant.wav");
+        _usernameInput.SetSound(TextBox.Sounds.RemoveText, "octave-tap-professional.wav");
+        _usernameInput.SetSound(TextBox.Sounds.Submit, "octave-tap-warm.wav");
 
         //Login Password Label/Textbox
-        var passwordBackground = new ImagePanel(this, "PasswordPanel");
-        _ = new Label(passwordBackground, "PasswordLabel")
+        _passwordPanel = new ImagePanel(this, nameof(_passwordPanel))
         {
+            X = 14,
+            Y = 96,
+            Width = 308,
+            Height = 22,
+            Margin = new Margin(14, 0, 0, 0),
+        };
+        _passwordLabel = new Label(_passwordPanel, nameof(_passwordLabel))
+        {
+            AutoSizeToContents = false,
+            Dock = Pos.Left,
+            Font = _defaultFont,
             Text = Strings.LoginWindow.Password,
+            TextAlign = Pos.Right | Pos.CenterV,
+            TextPadding = new Padding(0, 0, 10, 0),
         };
-        _txtPassword = new TextBoxPassword(passwordBackground, "PasswordField");
-        _txtPassword.SubmitPressed += (s, e) => TryLogin();
-        _txtPassword.TextChanged += _txtPassword_TextChanged;
-        _txtPassword.Clicked += _txtPassword_Clicked;
+        _passwordInput = new TextBoxPassword(_passwordPanel, nameof(_passwordInput))
+        {
+            Dock = Pos.Fill,
+            Font = _defaultFont,
+            TextAlign = Pos.Left | Pos.CenterV,
+            TextPadding = new Padding(2, 0),
+        };
+        _passwordInput.SubmitPressed += (s, e) => TryLogin();
+        _passwordInput.TextChanged += PasswordInputTextChanged;
+        _passwordInput.Clicked += PasswordInputClicked;
+        _passwordInput.SetSound(TextBox.Sounds.AddText, "octave-tap-resonant.wav");
+        _passwordInput.SetSound(TextBox.Sounds.RemoveText, "octave-tap-professional.wav");
+        _passwordInput.SetSound(TextBox.Sounds.Submit, "octave-tap-warm.wav");
 
         //Login Save Pass Checkbox
-        _chkSavePass = new LabeledCheckBox(this, "SavePassCheckbox")
+        _savePasswordCheckbox = new LabeledCheckBox(this, nameof(_savePasswordCheckbox))
         {
+            X = 13,
+            Y = 124,
+            Width = 160,
+            Height = 24,
+            Font = _defaultFont,
             Text = Strings.LoginWindow.SavePassword,
         };
 
         //Forgot Password Button
         _btnForgotPassword = new Button(this, "ForgotPasswordButton")
         {
-            IsHidden = true, Text = Strings.LoginWindow.ForgotPassword,
+            IsHidden = true,
+            Text = Strings.LoginWindow.ForgotPassword,
         };
         _btnForgotPassword.Clicked += _btnForgotPassword_Clicked;
 
@@ -89,29 +147,29 @@ public LoginWindow(Canvas parent, MainMenu mainMenu) : base(parent, "LoginWindow
 
     #region Input Handling
 
-    private void _txtUsername_Clicked(Base sender, MouseButtonState arguments)
+    private void UsernameInputClicked(Base sender, MouseButtonState arguments)
     {
         Globals.InputManager.OpenKeyboard(
             KeyboardType.Normal,
-            text => _txtUsername.Text = text ?? string.Empty,
+            text => _usernameInput.Text = text ?? string.Empty,
             Strings.LoginWindow.Username,
-            _txtUsername.Text,
-            inputBounds: _txtUsername.BoundsGlobal
+            _usernameInput.Text,
+            inputBounds: _usernameInput.BoundsGlobal
         );
     }
 
-    private void _txtPassword_TextChanged(Base sender, EventArgs arguments)
+    private void PasswordInputTextChanged(Base sender, EventArgs arguments)
     {
         _useSavedPass = false;
     }
 
-    private void _txtPassword_Clicked(Base sender, MouseButtonState arguments)
+    private void PasswordInputClicked(Base sender, MouseButtonState arguments)
     {
         Globals.InputManager.OpenKeyboard(
             KeyboardType.Password,
-            text => _txtPassword.Text = text ?? string.Empty,
+            text => _passwordInput.Text = text ?? string.Empty,
             Strings.LoginWindow.Password,
-            _txtPassword.Text
+            _passwordInput.Text
         );
     }
 
@@ -154,13 +212,13 @@ public override void Show()
         }
 
         // Set focus to the appropriate elements.
-        if (!string.IsNullOrWhiteSpace(_txtUsername.Text))
+        if (!string.IsNullOrWhiteSpace(_usernameInput.Text))
         {
-            _txtPassword.Focus();
+            _passwordInput.Focus();
         }
         else
         {
-            _txtUsername.Focus();
+            _usernameInput.Focus();
         }
     }
 
@@ -177,13 +235,13 @@ private void TryLogin()
             return;
         }
 
-        if (!FieldChecking.IsValidUsername(_txtUsername.Text, Strings.Regex.Username))
+        if (!FieldChecking.IsValidUsername(_usernameInput.Text, Strings.Regex.Username))
         {
             Interface.ShowError(Strings.Errors.UsernameInvalid);
             return;
         }
 
-        if (!FieldChecking.IsValidPassword(_txtPassword.Text, Strings.Regex.Password))
+        if (!FieldChecking.IsValidPassword(_passwordInput.Text, Strings.Regex.Password))
         {
             if (!_useSavedPass)
             {
@@ -195,17 +253,19 @@ private void TryLogin()
         var password = _savedPass;
         if (!_useSavedPass)
         {
-            password = PasswordUtils.ComputePasswordHash(_txtPassword.Text.Trim());
+            password = PasswordUtils.ComputePasswordHash(_passwordInput.Text.Trim());
         }
 
         Globals.WaitingOnServer = true;
         _btnLogin.Disable();
 
-        PacketSender.SendLogin(_txtUsername.Text, password);
+        PacketSender.SendLogin(_usernameInput.Text, password);
         SaveCredentials();
         ChatboxMsg.ClearMessages();
     }
 
+    private const string DefaultPasswordInputMask = "****************";
+
     private void LoadCredentials()
     {
         var name = Globals.Database.LoadPreference("Username");
@@ -214,27 +274,28 @@ private void LoadCredentials()
             return;
         }
 
-        _txtUsername.Text = name;
+        _usernameInput.Text = name;
         var pass = Globals.Database.LoadPreference("Password");
         if (string.IsNullOrEmpty(pass))
         {
             return;
         }
 
-        _txtPassword.Text = "****************";
+        _passwordInput.Text = DefaultPasswordInputMask;
+        _passwordInput.CursorPos = DefaultPasswordInputMask.Length;
         _savedPass = pass;
         _useSavedPass = true;
-        _chkSavePass.IsChecked = true;
+        _savePasswordCheckbox.IsChecked = true;
     }
 
     private void SaveCredentials()
     {
-        string username = string.Empty, password = string.Empty;
+        string? username = default, password = default;
 
-        if (_chkSavePass.IsChecked)
+        if (_savePasswordCheckbox.IsChecked)
         {
-            username = _txtUsername.Text.Trim();
-            password = _useSavedPass ? _savedPass : PasswordUtils.ComputePasswordHash(_txtPassword.Text.Trim());
+            username = _usernameInput.Text?.Trim();
+            password = _useSavedPass ? _savedPass : PasswordUtils.ComputePasswordHash(_passwordInput.Text?.Trim());
         }
 
         Globals.Database.SavePreference("Username", username);

Intersect.Client.Core/Localization/Strings.cs

@@ -1896,7 +1896,7 @@ public partial struct LoginWindow
         public static LocalizedString Login = @"Login";
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public static LocalizedString Password = @"Password:";
+        public static LocalizedString Password = @"Password";
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public static LocalizedString SavePassword = @"Save Password";
@@ -1905,7 +1905,7 @@ public partial struct LoginWindow
         public static LocalizedString Title = @"Login";
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-        public static LocalizedString Username = @"Username:";
+        public static LocalizedString Username = @"Username";
     }
 
     public partial struct Main