From a506be0832e89be97129bcb80effe2d6c0c67d76 Mon Sep 17 00:00:00 2001
From: Roman Shapiro <eleroman@mail.ru>
Date: Wed, 8 Nov 2023 23:28:18 +0700
Subject: [PATCH] Some refactoring

---
 .../AllWidgets.Generated.cs                   |  4 +-
 .../Myra.Samples.AllWidgets/allControls.xmmp  |  2 +-
 .../AllWidgets.Generated.cs                   |  2 +-
 src/Myra/Graphics2D/UI/Desktop.Input.cs       | 66 ++-----------------
 src/Myra/Graphics2D/UI/Desktop.cs             |  5 --
 src/Myra/MyraEnvironment.cs                   | 55 ++++++++++++++++
 src/MyraPad/Studio.cs                         | 20 ++----
 7 files changed, 69 insertions(+), 85 deletions(-)

diff --git a/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs b/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs
index d7ee0207..924a1242 100644
--- a/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs
+++ b/samples/Myra.Samples.AllWidgets/AllWidgets.Generated.cs
@@ -1,4 +1,4 @@
-/* Generated by MyraPad at 11/8/2023 1:41:26 PM */
+/* Generated by MyraPad at 11/8/2023 11:24:23 PM */
 using Myra;
 using Myra.Graphics2D;
 using Myra.Graphics2D.TextureAtlases;
@@ -116,7 +116,7 @@ private void BuildUI()
 			_buttonSaveFile = new ImageTextButton();
 			_buttonSaveFile.Text = "Save File";
 			_buttonSaveFile.Padding = new Thickness(8, 0);
-			_buttonSaveFile.Tooltip = "Tooltip 1";
+			_buttonSaveFile.Tooltip = "E=mc/v[-8]2/n/vdMass–energy equivalence.";
 			_buttonSaveFile.Id = "_buttonSaveFile";
 			Grid.SetColumn(_buttonSaveFile, 1);
 
diff --git a/samples/Myra.Samples.AllWidgets/allControls.xmmp b/samples/Myra.Samples.AllWidgets/allControls.xmmp
index d6b87ac2..d58be49c 100644
--- a/samples/Myra.Samples.AllWidgets/allControls.xmmp
+++ b/samples/Myra.Samples.AllWidgets/allControls.xmmp
@@ -32,7 +32,7 @@
               <Proportion Type="Fill" />
             </Grid.ColumnsProportions>
             <Label Text="Button:" />
-            <ImageTextButton Text="Save File" Padding="8, 0" Tooltip="Tooltip 1" Id="_buttonSaveFile" Grid.Column="1" />
+            <ImageTextButton Text="Save File" Padding="8, 0" Tooltip="E=mc/v[-8]2/n/vdMass–energy equivalence." Id="_buttonSaveFile" Grid.Column="1" />
             <TextBox Id="_textSaveFile" Grid.Column="2" />
             <Label Text="Another Button:" Grid.Row="1" />
             <ImageTextButton Text="Open File" Padding="8, 0" Tooltip="Tooltip 2" Id="_buttonOpenFile" Grid.Column="1" Grid.Row="1" />
diff --git a/samples/Myra.Samples.Silk.NET/AllWidgets.Generated.cs b/samples/Myra.Samples.Silk.NET/AllWidgets.Generated.cs
index 951d6b8b..b78b1e1f 100644
--- a/samples/Myra.Samples.Silk.NET/AllWidgets.Generated.cs
+++ b/samples/Myra.Samples.Silk.NET/AllWidgets.Generated.cs
@@ -127,7 +127,7 @@ private void BuildUI()
 			_buttonOpenFile = new ImageTextButton();
 			_buttonOpenFile.Text = "Open File";
 			_buttonOpenFile.Padding = new Thickness(8, 0);
-			_buttonOpenFile.Tooltip = "Tooltip 1";
+			_buttonOpenFile.Tooltip = "E=mc/v[-8]2/n/vdMass–energy equivalence.";
 			Grid.SetColumn(_buttonOpenFile, 1);
 			Grid.SetRow(_buttonOpenFile, 1);
 			_buttonOpenFile.Id = "_buttonOpenFile";
diff --git a/src/Myra/Graphics2D/UI/Desktop.Input.cs b/src/Myra/Graphics2D/UI/Desktop.Input.cs
index e33b1cee..aa27c695 100644
--- a/src/Myra/Graphics2D/UI/Desktop.Input.cs
+++ b/src/Myra/Graphics2D/UI/Desktop.Input.cs
@@ -43,8 +43,6 @@ partial class Desktop
 		private readonly List<InputEventType> _scheduledInputEvents = new List<InputEventType>();
 		private readonly List<InputEventType> _scheduledInputEventsCopy = new List<InputEventType>();
 
-		public Func<MouseInfo> MouseInfoGetter { get; set; }
-
 		public Point PreviousMousePosition { get; private set; }
 		public Point? PreviousTouchPosition { get; private set; }
 
@@ -110,9 +108,7 @@ public float MouseWheelDelta
 			}
 		}
 
-		public Action<bool[]> DownKeysGetter { get; set; }
 		public bool[] DownKeys => _downKeys;
-		public Action<Keys> KeyDownHandler;
 		public int RepeatKeyDownStartInMs { get; set; } = 500;
 
 		public int RepeatKeyDownInternalInMs { get; set; } = 50;
@@ -145,12 +141,12 @@ public static bool IsMobile
 
 		public void UpdateMouseInput()
 		{
-			if (MouseInfoGetter == null)
+			if (MyraEnvironment.MouseInfoGetter == null)
 			{
 				return;
 			}
 
-			var mouseInfo = MouseInfoGetter();
+			var mouseInfo = MyraEnvironment.MouseInfoGetter();
 
 			// Mouse Position
 			MousePosition = mouseInfo.Position;
@@ -210,12 +206,12 @@ public void UpdateTouchInput()
 
 		public void UpdateKeyboardInput()
 		{
-			if (DownKeysGetter == null)
+			if (MyraEnvironment.DownKeysGetter == null)
 			{
 				return;
 			}
 
-			DownKeysGetter(_downKeys);
+			MyraEnvironment.DownKeysGetter(_downKeys);
 
 			var now = DateTime.Now;
 			for (var i = 0; i < _downKeys.Length; ++i)
@@ -228,7 +224,7 @@ public void UpdateKeyboardInput()
 						FocusNextWidget();
 					}
 
-					KeyDownHandler?.Invoke(key);
+					OnKeyDown(key);
 
 					_lastKeyDown = now;
 					_keyDownCount = 0;
@@ -251,7 +247,7 @@ public void UpdateKeyboardInput()
 									  ((_keyDownCount == 0 && (now - _lastKeyDown.Value).TotalMilliseconds > RepeatKeyDownStartInMs) ||
 									  (_keyDownCount > 0 && (now - _lastKeyDown.Value).TotalMilliseconds > RepeatKeyDownInternalInMs)))
 					{
-						KeyDownHandler?.Invoke(key);
+						OnKeyDown(key);
 
 						_lastKeyDown = now;
 						++_keyDownCount;
@@ -332,55 +328,5 @@ public void ProcessInputEvents()
 				}
 			}
 		}
-
-		public MouseInfo DefaultMouseInfoGetter()
-		{
-#if MONOGAME || FNA
-			var state = Mouse.GetState();
-
-			return new MouseInfo
-			{
-				Position = new Point(state.X, state.Y),
-				IsLeftButtonDown = state.LeftButton == ButtonState.Pressed,
-				IsMiddleButtonDown = state.MiddleButton == ButtonState.Pressed,
-				IsRightButtonDown = state.RightButton == ButtonState.Pressed,
-				Wheel = state.ScrollWheelValue
-			};
-#elif STRIDE
-			var input = MyraEnvironment.Game.Input;
-
-			var v = input.AbsoluteMousePosition;
-
-			return new MouseInfo
-			{
-				Position = new Point((int)v.X, (int)v.Y),
-				IsLeftButtonDown = input.IsMouseButtonDown(MouseButton.Left),
-				IsMiddleButtonDown = input.IsMouseButtonDown(MouseButton.Middle),
-				IsRightButtonDown = input.IsMouseButtonDown(MouseButton.Right),
-				Wheel = input.MouseWheelDelta
-			};
-#else
-			return MyraEnvironment.Platform.GetMouseInfo();
-#endif
-		}
-
-		public void DefaultDownKeysGetter(bool[] keys)
-		{
-#if MONOGAME || FNA
-			var state = Keyboard.GetState();
-			for (var i = 0; i < keys.Length; ++i)
-			{
-				keys[i] = state.IsKeyDown((Keys)i);
-			}
-#elif STRIDE
-			var input = MyraEnvironment.Game.Input;
-			for (var i = 0; i < keys.Length; ++i)
-			{
-				keys[i] = input.IsKeyDown((Keys)i);
-			}
-#else
-			MyraEnvironment.Platform.SetKeysDown(keys);
-#endif
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Myra/Graphics2D/UI/Desktop.cs b/src/Myra/Graphics2D/UI/Desktop.cs
index 038c8853..5a9b7f8b 100644
--- a/src/Myra/Graphics2D/UI/Desktop.cs
+++ b/src/Myra/Graphics2D/UI/Desktop.cs
@@ -316,11 +316,6 @@ public Desktop()
 			Opacity = 1.0f;
 			Widgets.CollectionChanged += WidgetsOnCollectionChanged;
 
-			MouseInfoGetter = DefaultMouseInfoGetter;
-			DownKeysGetter = DefaultDownKeysGetter;
-
-			KeyDownHandler = OnKeyDown;
-
 #if FNA
 			TextInputEXT.TextInput += OnChar;
 #endif
diff --git a/src/Myra/MyraEnvironment.cs b/src/Myra/MyraEnvironment.cs
index c657c02f..60526e9c 100644
--- a/src/Myra/MyraEnvironment.cs
+++ b/src/Myra/MyraEnvironment.cs
@@ -19,6 +19,7 @@
 using Stride.Engine;
 using Stride.Graphics;
 using Stride.Core.Mathematics;
+using Stride.Input;
 #else
 using Myra.Platform;
 using System.Drawing;
@@ -226,6 +227,10 @@ public static AssetManager DefaultAssetManager
 		public static bool DrawMouseHoveredWidgetFrame { get; set; }
 		public static bool DrawTextGlyphsFrames { get; set; }
 		public static bool DisableClipping { get; set; }
+
+		public static Func<MouseInfo> MouseInfoGetter { get; set; } = DefaultMouseInfoGetter;
+		public static Action<bool[]> DownKeysGetter { get; set; } = DefaultDownKeysGetter;
+
 		public static int TooltipDelayInMs { get; set; } = 500;
 		public static Point TooltipOffset { get; set; } = new Point(0, 20);
 		public static Func<Widget, Widget> TooltipCreator { get; set; } = w =>
@@ -272,5 +277,55 @@ public static string Version
 		}
 
 		internal static string InternalClipboard;
+
+		internal static MouseInfo DefaultMouseInfoGetter()
+		{
+#if MONOGAME || FNA
+			var state = Mouse.GetState();
+
+			return new MouseInfo
+			{
+				Position = new Point(state.X, state.Y),
+				IsLeftButtonDown = state.LeftButton == ButtonState.Pressed,
+				IsMiddleButtonDown = state.MiddleButton == ButtonState.Pressed,
+				IsRightButtonDown = state.RightButton == ButtonState.Pressed,
+				Wheel = state.ScrollWheelValue
+			};
+#elif STRIDE
+			var input = Game.Input;
+
+			var v = input.AbsoluteMousePosition;
+
+			return new MouseInfo
+			{
+				Position = new Point((int)v.X, (int)v.Y),
+				IsLeftButtonDown = input.IsMouseButtonDown(MouseButton.Left),
+				IsMiddleButtonDown = input.IsMouseButtonDown(MouseButton.Middle),
+				IsRightButtonDown = input.IsMouseButtonDown(MouseButton.Right),
+				Wheel = input.MouseWheelDelta
+			};
+#else
+			return Platform.GetMouseInfo();
+#endif
+		}
+
+		internal static void DefaultDownKeysGetter(bool[] keys)
+		{
+#if MONOGAME || FNA
+			var state = Keyboard.GetState();
+			for (var i = 0; i < keys.Length; ++i)
+			{
+				keys[i] = state.IsKeyDown((Keys)i);
+			}
+#elif STRIDE
+			var input = Game.Input;
+			for (var i = 0; i < keys.Length; ++i)
+			{
+				keys[i] = input.IsKeyDown((Keys)i);
+			}
+#else
+			Platform.SetKeysDown(keys);
+#endif
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/MyraPad/Studio.cs b/src/MyraPad/Studio.cs
index 72bab77a..41540910 100644
--- a/src/MyraPad/Studio.cs
+++ b/src/MyraPad/Studio.cs
@@ -408,19 +408,6 @@ public void OnExiting()
 		private void BuildUI()
 		{
 			_desktop.ContextMenuClosed += Desktop_ContextMenuClosed;
-			_desktop.KeyDownHandler = key =>
-			{
-				if (_autoCompleteMenu != null &&
-					(key == Keys.Up || key == Keys.Down || key == Keys.Enter))
-				{
-					_autoCompleteMenu.OnKeyDown(key);
-				}
-				else
-				{
-					_desktop.OnKeyDown(key);
-				}
-			};
-
 			_desktop.KeyDown += (s, a) =>
 			{
 				if (_desktop.HasModalWidget || _ui._mainMenu.IsOpen)
@@ -1006,7 +993,10 @@ private void HandleAutoComplete()
 					var lastStartPos = _currentTagStart.Value;
 					var lastEndPos = cursorPos;
 					// Build context menu
-					_autoCompleteMenu = new VerticalMenu();
+					_autoCompleteMenu = new VerticalMenu
+					{
+						AcceptsKeyboardFocus = true
+					};
 					foreach (var a in all)
 					{
 						var menuItem = new MenuItem
@@ -1071,8 +1061,6 @@ private void HandleAutoComplete()
 					}
 
 					_desktop.ShowContextMenu(_autoCompleteMenu, screen);
-					// Keep focus at text field
-					_desktop.FocusedKeyboardWidget = _ui._textSource;
 
 					_refreshInitiated = null;
 				}