UI actions need to be triggered by a change in input state #2581

pandinocoder · pandinocoder · commit 830e9a542de9 · 2025-02-16T23:48:38.000+01:00
re-apply refactoring, this is what I get for starting working on this before comitting the massive texture overhaul changes :clown:
diff --git a/Intersect.Client.Core/Core/Controls/Controls.cs b/Intersect.Client.Core/Core/Controls/Controls.cs
@@ -323,6 +323,25 @@ private bool TrySaveBindingFor(Control control, int bindingIndex, ControlBinding
         }
     }
 
+    public static bool IsControlJustPressed(Control control) => IsControlJustPressed(control, out _, out _);
+
+    public static bool IsControlJustPressed(
+        Control control,
+        [NotNullWhen(true)] out ControlMapping? activeMapping,
+        [NotNullWhen(true)] out ControlBinding? activeBinding
+    )
+    {
+        if (ActiveControls.Mappings.TryGetValue(control, out var mapping) && mapping.IsActive(out activeBinding) && !activeBinding.WasDown())
+        {
+            activeMapping = mapping;
+            return true;
+        }
+
+        activeMapping = null;
+        activeBinding = null;
+        return false;
+    }
+
     public static bool IsControlPressed(Control control) => IsControlPressed(control, out _, out _);
 
     public static bool IsControlPressed(
diff --git a/Intersect.Client.Core/Entities/Player.cs b/Intersect.Client.Core/Entities/Player.cs
@@ -1863,7 +1863,7 @@ private void AutoTurnToTarget(Entity en)
 
     private static void ToggleTargetContextMenu(Entity en)
     {
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Right))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Right))
         {
             Interface.Interface.GameUi.TargetContextMenu.ToggleHidden(en);
         }
diff --git a/Intersect.Client.Core/Interface/Game/Bag/BagItem.cs b/Intersect.Client.Core/Interface/Game/Bag/BagItem.cs
@@ -116,7 +116,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
 
         mMouseOver = true;
         mCanDrag = true;
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             mCanDrag = false;
 
@@ -186,7 +186,7 @@ public void Update()
         {
             if (mMouseOver)
             {
-                if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))
+                if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
                 {
                     mCanDrag = true;
                     mMouseX = -1;
diff --git a/Intersect.Client.Core/Interface/Game/Bank/BankItem.cs b/Intersect.Client.Core/Interface/Game/Bank/BankItem.cs
@@ -134,7 +134,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
 
         mMouseOver = true;
         mCanDrag = true;
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             mCanDrag = false;
 
@@ -204,7 +204,7 @@ public void Update()
         {
             if (mMouseOver)
             {
-                if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))
+                if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
                 {
                     mCanDrag = true;
                     mMouseX = -1;
diff --git a/Intersect.Client.Core/Interface/Game/Character/EquipmentItem.cs b/Intersect.Client.Core/Interface/Game/Character/EquipmentItem.cs
@@ -91,7 +91,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
             return;
         }
 
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             return;
         }
diff --git a/Intersect.Client.Core/Interface/Game/Crafting/RecipeItem.cs b/Intersect.Client.Core/Interface/Game/Crafting/RecipeItem.cs
@@ -101,7 +101,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
 
         mMouseOver = true;
         mCanDrag = true;
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             mCanDrag = false;
 
diff --git a/Intersect.Client.Core/Interface/Game/Draggable.cs b/Intersect.Client.Core/Interface/Game/Draggable.cs
@@ -47,7 +47,7 @@ public bool Update()
             InputHandler.MousePosition.X - mPnl.Width / 2, InputHandler.MousePosition.Y - mPnl.Height / 2
         );
 
-        if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             return true;
         }
diff --git a/Intersect.Client.Core/Interface/Game/EventWindow.cs b/Intersect.Client.Core/Interface/Game/EventWindow.cs
@@ -12,8 +12,11 @@
 using Intersect.Client.Networking;
 using Intersect.Client.Utilities;
 using Intersect.Configuration;
+using Intersect.Core;
 using Intersect.Enums;
+using Intersect.Framework.Core;
 using Intersect.Utilities;
+using Microsoft.Extensions.Logging;
 
 namespace Intersect.Client.Interface.Game;
 
@@ -192,6 +195,7 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(
         MakeModal(dim: true);
         BringToFront();
         Interface.InputBlockingComponents.Add(this);
+        ApplicationContext.CurrentContext.Logger.LogTrace("Event window opened");
 
         #endregion Configure and Display
     }
@@ -239,10 +243,10 @@ private void Update()
                 optionButton.IsDisabled = disableResponse;
             }
         }
-        else if (Controls.IsControlPressed(Control.AttackInteract))
+        else if (Controls.IsControlJustPressed(Control.AttackInteract))
         {
             SkipTypewriting();
-            _promptScroller.ScrollToBottom();
+            Defer(_promptScroller.ScrollToBottom);
         }
         else
         {
@@ -256,6 +260,7 @@ public static void ShowOrUpdateDialog(Canvas canvas)
     {
         if (_instance is { } instance)
         {
+            // ApplicationContext.CurrentContext.Logger.LogTrace("Updating previous opened event window");
             instance.Update();
             return;
         }
diff --git a/Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs b/Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs
@@ -203,7 +203,7 @@ private void hotbarIcon_HoverEnter(Base sender, EventArgs arguments)
 
         _mouseOver = true;
         _canDrag = true;
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             _canDrag = false;
 
@@ -528,7 +528,7 @@ public void Update()
 
                 if (_mouseOver)
                 {
-                    if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))
+                    if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
                     {
                         _canDrag = true;
                         _mouseX = -1;
diff --git a/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs b/Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs
@@ -187,7 +187,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
 
         mMouseOver = true;
         mCanDrag = true;
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             mCanDrag = false;
 
@@ -358,7 +358,7 @@ public void Update()
         {
             if (mMouseOver)
             {
-                if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))
+                if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
                 {
                     mCanDrag = true;
                     mMouseX = -1;
diff --git a/Intersect.Client.Core/Interface/Game/MapItem/MapItemIcon.cs b/Intersect.Client.Core/Interface/Game/MapItem/MapItemIcon.cs
@@ -73,7 +73,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
             return;
         }
 
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             return;
         }
diff --git a/Intersect.Client.Core/Interface/Game/Shop/ShopItem.cs b/Intersect.Client.Core/Interface/Game/Shop/ShopItem.cs
@@ -115,7 +115,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
             return;
         }
 
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             return;
         }
diff --git a/Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs b/Intersect.Client.Core/Interface/Game/Spells/SpellItem.cs
@@ -114,7 +114,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)
 
         mMouseOver = true;
         mCanDrag = true;
-        if (Globals.InputManager.MouseButtonDown(MouseButton.Left))
+        if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
         {
             mCanDrag = false;
 
@@ -205,7 +205,7 @@ public void Update()
         {
             if (mMouseOver)
             {
-                if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))
+                if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))
                 {
                     mCanDrag = true;
                     mMouseX = -1;
diff --git a/Intersect.Client.Core/Interface/Game/TargetContextMenu.cs b/Intersect.Client.Core/Interface/Game/TargetContextMenu.cs
@@ -127,7 +127,7 @@ public void ToggleHidden(object? target)
             Open(Pos.None);
             SetPosition(newX, newY);
         }
-        else if (!Globals.InputManager.MouseButtonDown(MouseButton.Right))
+        else if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Right))
         {
             Close();
         }
diff --git a/Intersect.Client.Core/MonoGame/Input/MonoInput.cs b/Intersect.Client.Core/MonoGame/Input/MonoInput.cs
@@ -22,9 +22,14 @@ public partial class MonoInput : GameInput
 {
     private readonly Dictionary<Keys, MonoGameKeys> _intersectToMonoGameKeyMap;
 
-    private KeyboardState mLastKeyboardState;
+    private GamePadState _currentGamePadState;
+    private GamePadState _previousGamePadState;
 
-    private MouseState mLastMouseState;
+    private KeyboardState _currentKeyboardState;
+    private KeyboardState _previousKeyboardState;
+
+    private MouseState _currentMouseState;
+    private MouseState _previousMouseState;
 
     private int mMouseX;
 
@@ -39,8 +44,6 @@ public partial class MonoInput : GameInput
     private readonly GamePadCapabilities[] _gamePadCapabilities =
         new GamePadCapabilities[GamePad.MaximumGamePadCount];
 
-    private GamePadState _lastGamePadState;
-
     private int _activeGamePad;
 
     private bool _keyboardOpened;
@@ -163,27 +166,34 @@ private void Window_TextInput(object sender, TextInputEventArgs e)
         );
     }
 
-    public override bool MouseButtonDown(MouseButton mb)
+    private bool MouseButtonDown(MouseState mouseState, MouseButton mb)
     {
         switch (mb)
         {
             case MouseButton.Left:
-                return mLastMouseState.LeftButton == ButtonState.Pressed;
+                return mouseState.LeftButton == ButtonState.Pressed;
             case MouseButton.Right:
-                return mLastMouseState.RightButton == ButtonState.Pressed;
+                return mouseState.RightButton == ButtonState.Pressed;
             case MouseButton.Middle:
-                return mLastMouseState.MiddleButton == ButtonState.Pressed;
+                return mouseState.MiddleButton == ButtonState.Pressed;
             case MouseButton.X1:
-                return mLastMouseState.XButton1 == ButtonState.Pressed;
+                return mouseState.XButton1 == ButtonState.Pressed;
             case MouseButton.X2:
-                return mLastMouseState.XButton2 == ButtonState.Pressed;
+                return mouseState.XButton2 == ButtonState.Pressed;
             default:
                 throw new ArgumentOutOfRangeException(nameof(mb), mb, null);
         }
     }
 
+    public override bool IsMouseButtonDown(MouseButton mb) => MouseButtonDown(_currentMouseState, mb);
+
+    public override bool WasMouseButtonDown(MouseButton mb) => MouseButtonDown(_previousMouseState, mb);
+
     public override bool IsKeyDown(Keys key) =>
-        _intersectToMonoGameKeyMap.TryGetValue(key, out var mappedKey) && mLastKeyboardState.IsKeyDown(mappedKey);
+        _intersectToMonoGameKeyMap.TryGetValue(key, out var mappedKey) && _currentKeyboardState.IsKeyDown(mappedKey);
+
+    public override bool WasKeyDown(Keys key) =>
+        _intersectToMonoGameKeyMap.TryGetValue(key, out var mappedKey) && _previousKeyboardState.IsKeyDown(mappedKey);
 
     public override Pointf GetMousePosition()
     {
@@ -197,7 +207,7 @@ private void CheckMouseButton(Keys modifier, ButtonState bs, MouseButton mb)
             return; //No mouse input allowed while showing intro slides
         }
 
-        if (bs == ButtonState.Pressed && !MouseButtonDown(mb))
+        if (bs == ButtonState.Pressed && !IsMouseButtonDown(mb))
         {
             if (Core.Input.TestInterceptMouse(modifier, mb, down: true))
             {
@@ -210,7 +220,7 @@ private void CheckMouseButton(Keys modifier, ButtonState bs, MouseButton mb)
 
             Core.Input.OnMouseDown(modifier, mb);
         }
-        else if (bs == ButtonState.Released && MouseButtonDown(mb))
+        else if (bs == ButtonState.Released && IsMouseButtonDown(mb))
         {
             if (Core.Input.TestInterceptMouse(modifier, mb, down: false))
             {
@@ -368,7 +378,7 @@ public override void Update(TimeSpan elapsed)
 
             foreach (var key in _intersectToMonoGameKeyMap)
             {
-                if (keyboardState.IsKeyDown(key.Value) && !mLastKeyboardState.IsKeyDown(key.Value))
+                if (keyboardState.IsKeyDown(key.Value) && !_currentKeyboardState.IsKeyDown(key.Value))
                 {
                     ApplicationContext.Context.Value?.Logger.LogTrace("{0} -> {1}", key.Key, key.Value);
                     Interface.Interface.GwenInput.ProcessMessage(
@@ -379,7 +389,7 @@ public override void Update(TimeSpan elapsed)
 
                     Core.Input.OnKeyPressed(modifier, key.Key);
                 }
-                else if (!keyboardState.IsKeyDown(key.Value) && mLastKeyboardState.IsKeyDown(key.Value))
+                else if (!keyboardState.IsKeyDown(key.Value) && _currentKeyboardState.IsKeyDown(key.Value))
                 {
                     Interface.Interface.GwenInput.ProcessMessage(
                         new GwenInputMessage(
@@ -391,17 +401,17 @@ public override void Update(TimeSpan elapsed)
                 }
             }
 
-            mLastKeyboardState = keyboardState;
-            mLastMouseState = mouseState;
-            _lastGamePadState = gamePadState;
+            (_previousGamePadState, _currentGamePadState) = (_currentGamePadState, gamePadState);
+            (_previousKeyboardState, _currentKeyboardState) = (_currentKeyboardState, keyboardState);
+            (_previousMouseState, _currentMouseState) = (_currentMouseState, mouseState);
         }
         else
         {
-            var modifier = GetPressedModifier(mLastKeyboardState);
+            var modifier = GetPressedModifier(_currentKeyboardState);
 
             foreach (var key in _intersectToMonoGameKeyMap)
             {
-                if (mLastKeyboardState.IsKeyDown(key.Value))
+                if (_currentKeyboardState.IsKeyDown(key.Value))
                 {
                     Interface.Interface.GwenInput.ProcessMessage(
                         new GwenInputMessage(
@@ -418,8 +428,13 @@ public override void Update(TimeSpan elapsed)
             CheckMouseButton(modifier, ButtonState.Released, MouseButton.Middle);
             CheckMouseButton(modifier, ButtonState.Released, MouseButton.X1);
             CheckMouseButton(modifier, ButtonState.Released, MouseButton.X2);
-            mLastKeyboardState = new KeyboardState();
-            mLastMouseState = new MouseState();
+
+            _currentGamePadState = new GamePadState();
+            _previousGamePadState = new GamePadState();
+            _currentKeyboardState = new KeyboardState();
+            _previousKeyboardState = new KeyboardState();
+            _currentMouseState = new MouseState();
+            _previousMouseState = new MouseState();
         }
     }
 
diff --git a/Intersect.Client.Framework/Input/ControlBinding.cs b/Intersect.Client.Framework/Input/ControlBinding.cs
@@ -34,9 +34,27 @@ public bool IsDown()
 
         if (IsMouseKey && Key.TryGetMouseButton(out var mouseButton))
         {
-            return gameInput.MouseButtonDown(mouseButton);
+            return gameInput.IsMouseButtonDown(mouseButton);
         }
 
         return gameInput.IsKeyDown(Key);
     }
+
+    public bool WasDown()
+    {
+        var gameInput = GameInput.Current;
+
+        // Check to see if our modifier and real key are pressed!
+        if (Modifier != Keys.None && !gameInput.WasKeyDown(Modifier))
+        {
+            return false;
+        }
+
+        if (IsMouseKey && Key.TryGetMouseButton(out var mouseButton))
+        {
+            return gameInput.WasMouseButtonDown(mouseButton);
+        }
+
+        return gameInput.WasKeyDown(Key);
+    }
 }
diff --git a/Intersect.Client.Framework/Input/ControlMapping.cs b/Intersect.Client.Framework/Input/ControlMapping.cs
diff --git a/Intersect.Client.Framework/Input/GameInput.cs b/Intersect.Client.Framework/Input/GameInput.cs
diff --git a/Intersect.Client.Framework/Input/IGameInput.cs b/Intersect.Client.Framework/Input/IGameInput.cs

Original file line number	Diff line number	Diff line change
`@@ -1863,7 +1863,7 @@ private void AutoTurnToTarget(Entity en)`
`1863`	`1863`
`1864`	`1864`	`private static void ToggleTargetContextMenu(Entity en)`
`1865`	`1865`	`{`
`1866`		`- if (Globals.InputManager.MouseButtonDown(MouseButton.Right))`
	`1866`	`+ if (Globals.InputManager.IsMouseButtonDown(MouseButton.Right))`
`1867`	`1867`	`{`
`1868`	`1868`	`Interface.Interface.GameUi.TargetContextMenu.ToggleHidden(en);`
`1869`	`1869`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)`
`116`	`116`
`117`	`117`	`mMouseOver = true;`
`118`	`118`	`mCanDrag = true;`
`119`		`- if (Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`119`	`+ if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`120`	`120`	`{`
`121`	`121`	`mCanDrag = false;`
`122`	`122`
`@@ -186,7 +186,7 @@ public void Update()`
`186`	`186`	`{`
`187`	`187`	`if (mMouseOver)`
`188`	`188`	`{`
`189`		`- if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`189`	`+ if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`190`	`190`	`{`
`191`	`191`	`mCanDrag = true;`
`192`	`192`	`mMouseX = -1;`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)`
`134`	`134`
`135`	`135`	`mMouseOver = true;`
`136`	`136`	`mCanDrag = true;`
`137`		`- if (Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`137`	`+ if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`138`	`138`	`{`
`139`	`139`	`mCanDrag = false;`
`140`	`140`
`@@ -204,7 +204,7 @@ public void Update()`
`204`	`204`	`{`
`205`	`205`	`if (mMouseOver)`
`206`	`206`	`{`
`207`		`- if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`207`	`+ if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`208`	`208`	`{`
`209`	`209`	`mCanDrag = true;`
`210`	`210`	`mMouseX = -1;`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)`
`91`	`91`	`return;`
`92`	`92`	`}`
`93`	`93`
`94`		`- if (Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`94`	`+ if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`95`	`95`	`{`
`96`	`96`	`return;`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)`
`101`	`101`
`102`	`102`	`mMouseOver = true;`
`103`	`103`	`mCanDrag = true;`
`104`		`- if (Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`104`	`+ if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`105`	`105`	`{`
`106`	`106`	`mCanDrag = false;`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public bool Update()`
`47`	`47`	`InputHandler.MousePosition.X - mPnl.Width / 2, InputHandler.MousePosition.Y - mPnl.Height / 2`
`48`	`48`	`);`
`49`	`49`
`50`		`- if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`50`	`+ if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`51`	`51`	`{`
`52`	`52`	`return true;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,11 @@`
`12`	`12`	`using Intersect.Client.Networking;`
`13`	`13`	`using Intersect.Client.Utilities;`
`14`	`14`	`using Intersect.Configuration;`
	`15`	`+using Intersect.Core;`
`15`	`16`	`using Intersect.Enums;`
	`17`	`+using Intersect.Framework.Core;`
`16`	`18`	`using Intersect.Utilities;`
	`19`	`+using Microsoft.Extensions.Logging;`
`17`	`20`
`18`	`21`	`namespace Intersect.Client.Interface.Game;`
`19`	`22`
`@@ -192,6 +195,7 @@ private EventWindow(Canvas gameCanvas, Dialog dialog) : base(gameCanvas, nameof(`
`192`	`195`	`MakeModal(dim: true);`
`193`	`196`	`BringToFront();`
`194`	`197`	`Interface.InputBlockingComponents.Add(this);`
	`198`	`+ ApplicationContext.CurrentContext.Logger.LogTrace("Event window opened");`
`195`	`199`
`196`	`200`	`#endregion Configure and Display`
`197`	`201`	`}`
`@@ -239,10 +243,10 @@ private void Update()`
`239`	`243`	`optionButton.IsDisabled = disableResponse;`
`240`	`244`	`}`
`241`	`245`	`}`
`242`		`- else if (Controls.IsControlPressed(Control.AttackInteract))`
	`246`	`+ else if (Controls.IsControlJustPressed(Control.AttackInteract))`
`243`	`247`	`{`
`244`	`248`	`SkipTypewriting();`
`245`		`- _promptScroller.ScrollToBottom();`
	`249`	`+ Defer(_promptScroller.ScrollToBottom);`
`246`	`250`	`}`
`247`	`251`	`else`
`248`	`252`	`{`
`@@ -256,6 +260,7 @@ public static void ShowOrUpdateDialog(Canvas canvas)`
`256`	`260`	`{`
`257`	`261`	`if (_instance is { } instance)`
`258`	`262`	`{`
	`263`	`+ // ApplicationContext.CurrentContext.Logger.LogTrace("Updating previous opened event window");`
`259`	`264`	`instance.Update();`
`260`	`265`	`return;`
`261`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private void hotbarIcon_HoverEnter(Base sender, EventArgs arguments)`
`203`	`203`
`204`	`204`	`_mouseOver = true;`
`205`	`205`	`_canDrag = true;`
`206`		`- if (Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`206`	`+ if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`207`	`207`	`{`
`208`	`208`	`_canDrag = false;`
`209`	`209`
`@@ -528,7 +528,7 @@ public void Update()`
`528`	`528`
`529`	`529`	`if (_mouseOver)`
`530`	`530`	`{`
`531`		`- if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`531`	`+ if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`532`	`532`	`{`
`533`	`533`	`_canDrag = true;`
`534`	`534`	`_mouseX = -1;`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void pnl_HoverEnter(Base sender, EventArgs arguments)`
`187`	`187`
`188`	`188`	`mMouseOver = true;`
`189`	`189`	`mCanDrag = true;`
`190`		`- if (Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`190`	`+ if (Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`191`	`191`	`{`
`192`	`192`	`mCanDrag = false;`
`193`	`193`
`@@ -358,7 +358,7 @@ public void Update()`
`358`	`358`	`{`
`359`	`359`	`if (mMouseOver)`
`360`	`360`	`{`
`361`		`- if (!Globals.InputManager.MouseButtonDown(MouseButton.Left))`
	`361`	`+ if (!Globals.InputManager.IsMouseButtonDown(MouseButton.Left))`
`362`	`362`	`{`
`363`	`363`	`mCanDrag = true;`
`364`	`364`	`mMouseX = -1;`