From c9947b92ce1550fadfee3fe42bb80953ee0905cc Mon Sep 17 00:00:00 2001 From: WeylonSantana Date: Sat, 22 Feb 2025 12:21:03 -0300 Subject: [PATCH 1/4] fix: select character arrow visibility --- .../Interface/Menu/SelectCharacterWindow.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs b/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs index 73f579be6b..28a40beacc 100644 --- a/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs +++ b/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs @@ -173,6 +173,14 @@ protected override void EnsureInitialized() SizeToChildren(recursive: true); LoadJsonUi(GameContentManager.UI.Menu, Graphics.Renderer?.GetResolutionString()); + + // in case the json load is changing the visibility of the arrows when it shouldn't + // lets ensure the right value + if (CharacterSelectionPreviews != default) + { + _selectCharacterRightButton.IsHidden = CharacterSelectionPreviews.Length <= 1; + _selectCharacterLeftButton.IsHidden = CharacterSelectionPreviews.Length <= 1; + } } //Methods From 2964c1a6291d0d7815f872b67d471866caa233d6 Mon Sep 17 00:00:00 2001 From: WeylonSantana Date: Sat, 22 Feb 2025 16:40:47 -0300 Subject: [PATCH 2/4] created ensure arrows visibility --- .../Interface/Menu/SelectCharacterWindow.cs | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs b/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs index 28a40beacc..c2da43b234 100644 --- a/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs +++ b/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs @@ -173,14 +173,7 @@ protected override void EnsureInitialized() SizeToChildren(recursive: true); LoadJsonUi(GameContentManager.UI.Menu, Graphics.Renderer?.GetResolutionString()); - - // in case the json load is changing the visibility of the arrows when it shouldn't - // lets ensure the right value - if (CharacterSelectionPreviews != default) - { - _selectCharacterRightButton.IsHidden = CharacterSelectionPreviews.Length <= 1; - _selectCharacterLeftButton.IsHidden = CharacterSelectionPreviews.Length <= 1; - } + _ensureArrowsVisibility(); } //Methods @@ -348,6 +341,18 @@ public override void Show() _selectedCharacterIndex = 0; UpdateDisplay(); base.Show(); + _ensureArrowsVisibility(); + } + + private void _ensureArrowsVisibility() + { + // in case the json load is changing the visibility of the arrows when it shouldn't + // lets ensure the right value + if (CharacterSelectionPreviews != default) + { + _selectCharacterRightButton.IsHidden = CharacterSelectionPreviews.Length <= 1; + _selectCharacterLeftButton.IsHidden = CharacterSelectionPreviews.Length <= 1; + } } private void _buttonLogout_Clicked(Base sender, MouseButtonState arguments) From 617018b0dca2ec1ac95155a9c2292a1c6a6bf538 Mon Sep 17 00:00:00 2001 From: lodicolo Date: Sat, 22 Feb 2025 20:48:03 +0100 Subject: [PATCH 3/4] Update SelectCharacterWindow.cs --- .../Interface/Menu/SelectCharacterWindow.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs b/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs index c2da43b234..f320593c00 100644 --- a/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs +++ b/Intersect.Client.Core/Interface/Menu/SelectCharacterWindow.cs @@ -173,7 +173,7 @@ protected override void EnsureInitialized() SizeToChildren(recursive: true); LoadJsonUi(GameContentManager.UI.Menu, Graphics.Renderer?.GetResolutionString()); - _ensureArrowsVisibility(); + EnsureArrowsVisibility(); } //Methods @@ -341,10 +341,10 @@ public override void Show() _selectedCharacterIndex = 0; UpdateDisplay(); base.Show(); - _ensureArrowsVisibility(); + EnsureArrowsVisibility(); } - private void _ensureArrowsVisibility() + private void EnsureArrowsVisibility() { // in case the json load is changing the visibility of the arrows when it shouldn't // lets ensure the right value @@ -448,4 +448,4 @@ public void ButtonPlay_Clicked(Base? sender, MouseButtonState? arguments) _buttonDelete.Disable(); _buttonLogout.Disable(); } -} \ No newline at end of file +} From 69b862ca75cbf618164a4ad09f2e530f768ea0ea Mon Sep 17 00:00:00 2001 From: lodicolo Date: Sat, 22 Feb 2025 20:48:23 +0100 Subject: [PATCH 4/4] Update SelectCharacterWindow.cs