From 23f3df7752fe2d991403a1a1c6f6aa0fc83c58cc Mon Sep 17 00:00:00 2001 From: Ephememory Date: Mon, 28 Nov 2022 20:03:04 -0600 Subject: [PATCH 1/4] start cursor from xhair on tabmenu open --- code/UI/General/TabMenus/TabMenus.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/UI/General/TabMenus/TabMenus.cs b/code/UI/General/TabMenus/TabMenus.cs index c2f00188d..1568af6c5 100644 --- a/code/UI/General/TabMenus/TabMenus.cs +++ b/code/UI/General/TabMenus/TabMenus.cs @@ -83,6 +83,14 @@ public override void Tick() [Event.BuildInput] private void MenuInput( InputBuilder input ) { - SetClass( "show", input.Down( InputButton.Score ) ); + var scoreButtonDown = input.Down( InputButton.Score ); + + SetClass( "show", scoreButtonDown ); + + if ( !scoreButtonDown ) + { + Input.MouseDelta = Vector2.Zero; + Mouse.Position = Screen.Size / 2; + } } } From ee18b10322c1b05e4bb62efdaa50bddde900f6a4 Mon Sep 17 00:00:00 2001 From: Ephememory Date: Mon, 28 Nov 2022 20:08:56 -0600 Subject: [PATCH 2/4] remove var cleaner impl --- code/UI/General/TabMenus/TabMenus.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/UI/General/TabMenus/TabMenus.cs b/code/UI/General/TabMenus/TabMenus.cs index 1568af6c5..e8a956dd4 100644 --- a/code/UI/General/TabMenus/TabMenus.cs +++ b/code/UI/General/TabMenus/TabMenus.cs @@ -83,14 +83,12 @@ public override void Tick() [Event.BuildInput] private void MenuInput( InputBuilder input ) { - var scoreButtonDown = input.Down( InputButton.Score ); - - SetClass( "show", scoreButtonDown ); - - if ( !scoreButtonDown ) + if ( !input.Down( InputButton.Score ) ) { Input.MouseDelta = Vector2.Zero; Mouse.Position = Screen.Size / 2; } + + SetClass( "show", input.Down( InputButton.Score ) ); } } From f12aed5721173afe05a4bd021c81c79871893719 Mon Sep 17 00:00:00 2001 From: Ephememory Date: Tue, 29 Nov 2022 09:41:55 -0600 Subject: [PATCH 3/4] revert back to Released --- code/UI/General/TabMenus/TabMenus.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/UI/General/TabMenus/TabMenus.cs b/code/UI/General/TabMenus/TabMenus.cs index e8a956dd4..8b6fa0c35 100644 --- a/code/UI/General/TabMenus/TabMenus.cs +++ b/code/UI/General/TabMenus/TabMenus.cs @@ -83,7 +83,7 @@ public override void Tick() [Event.BuildInput] private void MenuInput( InputBuilder input ) { - if ( !input.Down( InputButton.Score ) ) + if ( input.Released( InputButton.Score ) ) { Input.MouseDelta = Vector2.Zero; Mouse.Position = Screen.Size / 2; From 052991302b9d2141b8f908bd5b1dcee7f6515540 Mon Sep 17 00:00:00 2001 From: Ephememory Date: Sun, 25 Dec 2022 12:20:48 -0600 Subject: [PATCH 4/4] changes after merge --- code/UI/General/TabMenus/TabMenus.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/UI/General/TabMenus/TabMenus.cs b/code/UI/General/TabMenus/TabMenus.cs index 05381faf0..1ae4a8865 100644 --- a/code/UI/General/TabMenus/TabMenus.cs +++ b/code/UI/General/TabMenus/TabMenus.cs @@ -83,6 +83,12 @@ public override void Tick() [Event.Client.BuildInput] private void BuildInput() { + if ( Input.Released( InputButton.Score ) ) + { + Input.MouseDelta = Vector2.Zero; + Mouse.Position = Screen.Size / 2; + } + SetClass( "show", Input.Down( InputButton.Score ) ); } }