fix(basetype): encapslue

changewin handler fix typo and inherits

base win need be public

set win postion to base

base win rename

mWIndow to MyWIndow

re rename

remove basewin close method

Author: PostCyberPunk

Core/Editor/Base/BaseWinKeyHandler.cs

@@ -1,10 +1,9 @@
-namespace PCP.WhichKey.Core
+namespace PCP.WhichKey.Types
 {
 	public abstract class BaseWinKeyHandler
 	{
 		public abstract void ShowWindow();
 		public virtual void OnActive() { }
-		public abstract void CloseWindow();
 		public abstract void HandleKey(int key);
 	}
 }

Core/Editor/Base/DepthKeyHandler.cs

@@ -12,11 +12,11 @@ public override sealed void HandleKey(int key)
 			mKeySeq.Push(key);
 			HandleKeyWithDepth(key);
 			if (maxDepth > 0 && CheckDepth())
-				mWindow.Close();
+				window.Close();
 			else
 			{
 				UpdateWindow();
-				mWindow.UpdateHints();
+				window.UpdateHints();
 			}
 		}
 

Core/Editor/Base/WindowKeyHandler.cs

@@ -5,26 +5,22 @@ namespace PCP.WhichKey.Types
 {
 	public abstract class WindowKeyHandler<T> : BaseWinKeyHandler where T : WkBaseWindow
 	{
-		protected T mWindow;
+		protected T window;
 
 		public override void ShowWindow()
 		{
-			if (mWindow == null)
+			if (window == null)
 			{
-				mWindow = ScriptableObject.CreateInstance<T>();
+				window = ScriptableObject.CreateInstance<T>();
 			}
 
-			mWindow.OnActive();
-			mWindow.UpdateDelayTimer();
+			window.OnActive();
+			window.UpdateDelayTimer();
 
-			mWindow.ShowPopup();
-			mWindow.minSize = new Vector2(0, 0);
-			mWindow.position = new Rect(0, 0, 0, 0);
+			window.ShowPopup();
+			window.minSize = new Vector2(0, 0);
+			window.position = new Rect(0, 0, 0, 0);
 		}
 
-		public override void CloseWindow()
-		{
-			mWindow.Close();
-		}
 	}
 }

Core/Editor/Base/WkBaseWindow.cs

@@ -7,15 +7,16 @@ namespace PCP.WhichKey.Types
 	public abstract class WkBaseWindow : EditorWindow
 	{
 		//FIXME
-		protected float DefaultTimeoutLen => WhichKeyPreferences.instance.Timeout;
+		private static WhichKeyPreferences pref => WhichKeyPreferences.instance;
 		private bool keyReleased = true;
 		private KeyCode prevKey;
 		private float hideTill;
 		private bool showHint;
 		private bool _changeUI;
 		private bool needClose;
-		protected float mWidth;
-		protected float mHeight;
+		protected float DefaultTimeoutLen => pref.Timeout;
+		protected float winWidth;
+		protected float winHeight;
 		protected float timeoutLen;
 		public virtual void OnActive()
 		{
@@ -129,6 +130,18 @@ private void CheckDelayTimer()
 				Repaint();
 			}
 		}
+		protected void SetWindowPosition()
+		{
+			if (pref.WindowFollowMouse)
+			{
+				Vector2 mousePos = GUIUtility.GUIToScreenPoint(Event.current.mousePosition);
+				position = new Rect(mousePos.x - winWidth / 2, mousePos.y - winHeight / 2, winWidth, winHeight);
+			}
+			else
+			{
+				position = new Rect(pref.FixedPosition.x, pref.FixedPosition.y, winWidth, winHeight);
+			}
+		}
 
 		private void OnLostFocus() => base.Close();
 		public new void Close() => needClose = true;

Core/Editor/Commands/ChangeWinHandlerCmd.cs

@@ -1,11 +1,11 @@
 using PCP.WhichKey.Core;
 namespace PCP.WhichKey.Types
 {
-	public abstract class ChangeWinHandlerCmd
+	public abstract class ChangeWinHandlerCmd:WKCommand
 	{
 		public abstract BaseWinKeyHandler Handler { get; }
 		public virtual bool isEnd => true;
-		public void Excute()
+		public void Execute()
 		{
 			OnActive();
 			WhichKeyManager.instance.ChangeWinKeyHandler(Handler);

Core/Editor/Main/TreeHandler.cs

@@ -49,7 +49,7 @@ public void ProcessKey(int Key)
 			if (kn == null)
 			{
 				WkLogger.LogInfo($"KeySeq {mKeyLabel} not found");
-				mWindow.Close();
+				window.Close();
 			}
 			else if (kn.Type == 0)
 			{
@@ -62,7 +62,7 @@ public void ProcessKey(int Key)
 				if (cmd == null)
 				{
 					WkLogger.LogError($"KeySeq {mKeyLabel} has no command");
-					mWindow.Close();
+					window.Close();
 					return;
 				}
 				try
@@ -73,14 +73,14 @@ public void ProcessKey(int Key)
 				{
 					WkLogger.LogError($"KeySeq {mKeyLabel} execute failed\n{e}");
 				}
-				if (cmd.isEnd) mWindow.Close();
+				if (cmd.isEnd) window.Close();
 			}
 		}
 
 		protected override void UpdateWindow()
 		{
-			mWindow.Hints = GetLayerHints();
-			mWindow.Title = GetLayerName();
+			window.Hints = GetLayerHints();
+			window.Title = GetLayerName();
 		}
 
 		public LayerHint[] GetLayerHints()
@@ -177,7 +177,7 @@ public void ChangeHandler(IWkHandler handler, int depth)
 			mCurrentHandler = handler;
 			if (depth > 0)
 				maxDepth = mKeySeq.Count + depth;
-			mWindow.OverreideSets(handler.Timeout, handler.ColWidth);
+			window.OverreideSets(handler.Timeout, handler.ColWidth);
 			// if (handler is IWkWinModifier modifer)
 			// {
 			// 	if (mWindow == null)

Core/Editor/Windows/MainHintsWindow.cs

@@ -16,8 +16,6 @@ internal class MainHintsWindow : WkBaseWindow
 		//Maybe a structure
 		//OPT
 		internal static float lineHeight;
-		private static bool followMouse;
-		private static Vector2 fixedPosition;
 		private static int maxHintLines;
 		private static float maxColWidth;
 		private static VisualTreeAsset hintLabel;
@@ -51,8 +49,6 @@ public static void Init()
 
 			var pref = WhichKeyPreferences.instance;
 			var uil = UILoader.instance;
-			followMouse = pref.WindowFollowMouse;
-			fixedPosition = pref.FixedPosition;
 			maxHintLines = pref.MaxHintLines;
 			maxColWidth = pref.ColWidth;
 			hintLabel = uil.HintLabel;
@@ -102,23 +98,23 @@ protected override void ShowHints()
 			labelFrame.Clear();
 			if (Hints.Length == 0)
 			{
-				mHeight = lineHeight + 2 * mainFrame.resolvedStyle.paddingTop;
-				mWidth = mColWidth + mainFrame.resolvedStyle.paddingLeft * 2;
-				maxSize = new Vector2(mWidth, mHeight);
+				winHeight = lineHeight + 2 * mainFrame.resolvedStyle.paddingTop;
+				winWidth = mColWidth + mainFrame.resolvedStyle.paddingLeft * 2;
+				maxSize = new Vector2(winWidth, winHeight);
 			}
 			else
 			{
-				mHeight = lineHeight * (maxHintLines + 1) + 2 * mainFrame.resolvedStyle.paddingTop;
+				winHeight = lineHeight * (maxHintLines + 1) + 2 * mainFrame.resolvedStyle.paddingTop;
 				var cols = Mathf.CeilToInt((float)Hints.Length / maxHintLines);
-				mWidth = cols * mColWidth + mainFrame.resolvedStyle.paddingLeft * 2;
-				maxSize = new Vector2(mWidth, mHeight);
+				winWidth = cols * mColWidth + mainFrame.resolvedStyle.paddingLeft * 2;
+				maxSize = new Vector2(winWidth, winHeight);
 
 				for (int j = 0; j < cols; j++)
 				{
 					var col = new VisualElement();
 					col.style.flexDirection = FlexDirection.Column;
 					col.style.width = mColWidth;
-					col.style.height = mHeight;
+					col.style.height = winHeight;
 					for (int i = 0; i < maxHintLines; i++)
 					{
 						int ind = i + j * maxHintLines;
@@ -136,16 +132,7 @@ protected override void ShowHints()
 					labelFrame.Add(col);
 				}
 			}
-
-			if (followMouse)
-			{
-				Vector2 mousePos = GUIUtility.GUIToScreenPoint(Event.current.mousePosition);
-				position = new Rect(mousePos.x - mWidth / 2, mousePos.y - mHeight / 2, mWidth, mHeight);
-			}
-			else
-			{
-				position = new Rect(fixedPosition.x, fixedPosition.y, mWidth, mHeight);
-			}
+			SetWindowPosition();
 		}
 	}
 }