fix: input hotkey adjustments

sorrowmoil · sorrowmoil · commit ef84a267e9cb · 2026-04-15T01:36:51.000+08:00
diff --git a/src/XUnity.AutoTranslator.Plugin.Core/UI/TranslationAggregatorOptionsWindow.cs b/src/XUnity.AutoTranslator.Plugin.Core/UI/TranslationAggregatorOptionsWindow.cs
@@ -66,48 +66,51 @@ private void CreateWindowUI( int id )
          {
             AutoTranslationPlugin.Current.DisableAutoTranslator();
 
+            float posy = GUIUtil.WindowTitleClearance + GUIUtil.ComponentSpacing;
+
             if( GUI.Button( GUIUtil.R( WindowWidth - 22, 2, 20, 16 ), "X" ) )
             {
                IsShown = false;
             }
 
-            GUILayout.Label( "Available Translators" );
+            GUI.Label( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, WindowWidth - GUIUtil.ComponentSpacing, GUIUtil.LabelHeight ), "Available Translators" );
+            posy += GUIUtil.LabelHeight + GUIUtil.HalfComponentSpacing;
 
-            // GROUP
-            _scrollPosition = GUILayout.BeginScrollView( _scrollPosition, GUI.skin.box );
+            GUI.Box( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, WindowWidth - GUIUtil.ComponentSpacing, _toggles.Count * GUIUtil.RowHeight + GUIUtil.ComponentSpacing ), "" );
+            posy += GUIUtil.HalfComponentSpacing;
 
             foreach( var vm in _toggles )
             {
                var previousEnabled = GUI.enabled;
 
                GUI.enabled = vm.Enabled;
                var previousValue = vm.IsToggled();
-               var newValue = GUILayout.Toggle( previousValue, vm.Text );
+               var newValue = GUI.Toggle( GUIUtil.R( GUIUtil.ComponentSpacing, posy, WindowWidth - GUIUtil.ComponentSpacing * 2, GUIUtil.RowHeight ), previousValue, vm.Text );
                if( previousValue != newValue )
                {
                   vm.OnToggled();
                }
 
                GUI.enabled = previousEnabled;
+               posy += GUIUtil.RowHeight;
             }
 
-            GUILayout.EndScrollView();
+            posy += GUIUtil.HalfComponentSpacing + GUIUtil.ComponentSpacing;
+
+            GUI.Label( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, 60, GUIUtil.LabelHeight ), "Height" );
+            _viewModel.Height = Mathf.Round( GUI.HorizontalSlider( GUIUtil.R( GUIUtil.HalfComponentSpacing + 60, posy + 5, WindowWidth - GUIUtil.ComponentSpacing * 2 - 60, GUIUtil.LabelHeight ), _viewModel.Height, 50, 300 ) );
+            posy += GUIUtil.LabelHeight + GUIUtil.ComponentSpacing;
 
-            GUILayout.BeginHorizontal();
-            GUILayout.Label( "Height" );
-            _viewModel.Height = Mathf.Round( GUILayout.HorizontalSlider( _viewModel.Height, 50, 300, GUILayout.MaxWidth( 250 ) ) );
-            GUILayout.EndHorizontal();
+            GUI.Label( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, 60, GUIUtil.LabelHeight ), "Width" );
+            _viewModel.Width = Mathf.Round( GUI.HorizontalSlider( GUIUtil.R( GUIUtil.HalfComponentSpacing + 60, posy + 5, WindowWidth - GUIUtil.ComponentSpacing * 2 - 60, GUIUtil.LabelHeight ), _viewModel.Width, 200, 1000 ) );
+            posy += GUIUtil.LabelHeight + GUIUtil.ComponentSpacing;
 
-            GUILayout.BeginHorizontal();
-            GUILayout.Label( "Width" );
-            _viewModel.Width = Mathf.Round( GUILayout.HorizontalSlider( _viewModel.Width, 200, 1000, GUILayout.MaxWidth( 250 ) ) );
-            GUILayout.EndHorizontal();
+            _windowRect.height = posy + GUIUtil.ComponentSpacing;
 
             GUI.DragWindow();
          }
          finally
          {
-
             AutoTranslationPlugin.Current.EnableAutoTranslator();
          }
       }
diff --git a/src/XUnity.AutoTranslator.Plugin.Core/UI/TranslationAggregatorWindow.cs b/src/XUnity.AutoTranslator.Plugin.Core/UI/TranslationAggregatorWindow.cs
@@ -199,6 +199,8 @@ private void CreateWindowUI( int id )
          }
       }
 
+      private bool? _isScrollViewSupported;
+
       private void DrawTextArea( float posy, ScrollPositioned positioned, string title, IEnumerable<string> texts )
       {
          GUI.Label( GUIUtil.R( GUIUtil.HalfComponentSpacing + 5, posy + 5, _viewModel.Width - GUIUtil.ComponentSpacing, GUIUtil.LabelHeight ), title );
@@ -207,15 +209,39 @@ private void DrawTextArea( float posy, ScrollPositioned positioned, string title
 
          float boxWidth = _viewModel.Width - GUIUtil.ComponentSpacing;
          float boxHeight = _viewModel.Height - GUIUtil.LabelHeight;
-         GUILayout.BeginArea( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, boxWidth, boxHeight ) );
-         positioned.ScrollPosition = GUILayout.BeginScrollView( positioned.ScrollPosition, GUI.skin.box );
+         GUILayout.BeginArea( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, boxWidth, boxHeight ), GUI.skin.box );
 
-         foreach( var text in texts )
+         if( _isScrollViewSupported == false )
+         {
+            foreach( var text in texts )
+            {
+               GUILayout.Label( text, GUIUtil.LabelTranslation, ArrayHelper.Null<GUILayoutOption>() );
+            }
+         }
+         else
          {
-            GUILayout.Label( text, GUIUtil.LabelTranslation, ArrayHelper.Null<GUILayoutOption>() );
+            try
+            {
+               positioned.ScrollPosition = GUILayout.BeginScrollView( positioned.ScrollPosition, ArrayHelper.Null<GUILayoutOption>() );
+               _isScrollViewSupported = true;
+
+               foreach( var text in texts )
+               {
+                  GUILayout.Label( text, GUIUtil.LabelTranslation, ArrayHelper.Null<GUILayoutOption>() );
+               }
+
+               GUILayout.EndScrollView();
+            }
+            catch( Exception )
+            {
+               _isScrollViewSupported = false;
+               foreach( var text in texts )
+               {
+                  GUILayout.Label( text, GUIUtil.LabelTranslation, ArrayHelper.Null<GUILayoutOption>() );
+               }
+            }
          }
 
-         GUILayout.EndScrollView();
          GUILayout.EndArea();
       }
    }
diff --git a/src/XUnity.Common/Utilities/UnityInput.cs b/src/XUnity.Common/Utilities/UnityInput.cs
@@ -29,11 +29,16 @@ public static IInputSystem Current
                 {
                     try
                     {
-                        try
-                        {
-                            _current = new LegacyInputSystem();
-                            XuaLogger.AutoTranslator.Debug( "[UnityInput] Using LegacyInputSystem" );
-                        }
+                                                    try
+                                                    {
+                        #if IL2CPP
+                                                        _current = new Il2CppLegacyInputSystem();
+                                                        XuaLogger.AutoTranslator.Debug( "[UnityInput] Using Il2CppLegacyInputSystem" );
+                        #else
+                                                        _current = new LegacyInputSystem();
+                                                        XuaLogger.AutoTranslator.Debug( "[UnityInput] Using LegacyInputSystem" );
+                        #endif
+                                                    }
                         catch
                         {
                             var newInputSystem = new NewInputSystem();
@@ -54,7 +59,11 @@ public static IInputSystem Current
         /// <summary>
         /// True if the Input class is not disabled.
         /// </summary>
+#if IL2CPP
+        public bool LegacyInputSystemAvailable => Current is Il2CppLegacyInputSystem;
+#else
         public bool LegacyInputSystemAvailable => Current is LegacyInputSystem;
+#endif
     }
 
     /// <summary>
@@ -894,4 +903,141 @@ internal class LegacyInputSystem : IInputSystem
 
         public IEnumerable<KeyCode> SupportedKeyCodes { get; } = (KeyCode[])Enum.GetValues(typeof(KeyCode));
     }
+
+#if IL2CPP
+    internal class Il2CppLegacyInputSystem : IInputSystem
+    {
+        private Type GetInputType()
+        {
+            var type = XUnity.Common.Constants.UnityTypes.Input?.ClrType;
+            if (type == null) throw new InvalidOperationException("Failed to find the UnityEngine.Input type");
+            return type;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public Il2CppLegacyInputSystem() => GetKeyDown(KeyCode.A);
+
+        private System.Reflection.MethodInfo _getKeyString;
+        public bool GetKey(string name)
+        {
+            if (_getKeyString == null) _getKeyString = GetInputType().GetMethod("GetKey", new[] { typeof(string) });
+            return _getKeyString != null && (bool)_getKeyString.Invoke(null, new object[] { name });
+        }
+
+        private System.Reflection.MethodInfo _getKey;
+        public bool GetKey(KeyCode key)
+        {
+            if (_getKey == null) _getKey = GetInputType().GetMethod("GetKey", new[] { typeof(KeyCode) });
+            return _getKey != null && (bool)_getKey.Invoke(null, new object[] { key });
+        }
+
+        private System.Reflection.MethodInfo _getKeyDownString;
+        public bool GetKeyDown(string name)
+        {
+            if (_getKeyDownString == null) _getKeyDownString = GetInputType().GetMethod("GetKeyDown", new[] { typeof(string) });
+            return _getKeyDownString != null && (bool)_getKeyDownString.Invoke(null, new object[] { name });
+        }
+
+        private System.Reflection.MethodInfo _getKeyDown;
+        public bool GetKeyDown(KeyCode key)
+        {
+            if (_getKeyDown == null) _getKeyDown = GetInputType().GetMethod("GetKeyDown", new[] { typeof(KeyCode) });
+            return _getKeyDown != null && (bool)_getKeyDown.Invoke(null, new object[] { key });
+        }
+
+        private System.Reflection.MethodInfo _getKeyUpString;
+        public bool GetKeyUp(string name)
+        {
+            if (_getKeyUpString == null) _getKeyUpString = GetInputType().GetMethod("GetKeyUp", new[] { typeof(string) });
+            return _getKeyUpString != null && (bool)_getKeyUpString.Invoke(null, new object[] { name });
+        }
+
+        private System.Reflection.MethodInfo _getKeyUp;
+        public bool GetKeyUp(KeyCode key)
+        {
+            if (_getKeyUp == null) _getKeyUp = GetInputType().GetMethod("GetKeyUp", new[] { typeof(KeyCode) });
+            return _getKeyUp != null && (bool)_getKeyUp.Invoke(null, new object[] { key });
+        }
+
+        private System.Reflection.MethodInfo _getMouseButton;
+        public bool GetMouseButton(int button)
+        {
+            if (_getMouseButton == null) _getMouseButton = GetInputType().GetMethod("GetMouseButton", new[] { typeof(int) });
+            return _getMouseButton != null && (bool)_getMouseButton.Invoke(null, new object[] { button });
+        }
+
+        private System.Reflection.MethodInfo _getMouseButtonDown;
+        public bool GetMouseButtonDown(int button)
+        {
+            if (_getMouseButtonDown == null) _getMouseButtonDown = GetInputType().GetMethod("GetMouseButtonDown", new[] { typeof(int) });
+            return _getMouseButtonDown != null && (bool)_getMouseButtonDown.Invoke(null, new object[] { button });
+        }
+
+        private System.Reflection.MethodInfo _getMouseButtonUp;
+        public bool GetMouseButtonUp(int button)
+        {
+            if (_getMouseButtonUp == null) _getMouseButtonUp = GetInputType().GetMethod("GetMouseButtonUp", new[] { typeof(int) });
+            return _getMouseButtonUp != null && (bool)_getMouseButtonUp.Invoke(null, new object[] { button });
+        }
+
+        private System.Reflection.MethodInfo _resetInputAxes;
+        public void ResetInputAxes()
+        {
+            if (_resetInputAxes == null) _resetInputAxes = GetInputType().GetMethod("ResetInputAxes", Type.EmptyTypes);
+            _resetInputAxes?.Invoke(null, null);
+        }
+
+        private System.Reflection.PropertyInfo _mousePosition;
+        public Vector3 mousePosition
+        {
+            get
+            {
+                if (_mousePosition == null) _mousePosition = GetInputType().GetProperty("mousePosition");
+                return _mousePosition != null ? (Vector3)_mousePosition.GetValue(null, null) : Vector3.zero;
+            }
+        }
+
+        private System.Reflection.PropertyInfo _mouseScrollDelta;
+        public Vector2 mouseScrollDelta
+        {
+            get
+            {
+                if (_mouseScrollDelta == null) _mouseScrollDelta = GetInputType().GetProperty("mouseScrollDelta");
+                return _mouseScrollDelta != null ? (Vector2)_mouseScrollDelta.GetValue(null, null) : Vector2.zero;
+            }
+        }
+
+        private System.Reflection.PropertyInfo _mousePresent;
+        public bool mousePresent
+        {
+            get
+            {
+                if (_mousePresent == null) _mousePresent = GetInputType().GetProperty("mousePresent");
+                return _mousePresent != null && (bool)_mousePresent.GetValue(null, null);
+            }
+        }
+
+        private System.Reflection.PropertyInfo _anyKey;
+        public bool anyKey
+        {
+            get
+            {
+                if (_anyKey == null) _anyKey = GetInputType().GetProperty("anyKey");
+                return _anyKey != null && (bool)_anyKey.GetValue(null, null);
+            }
+        }
+
+        private System.Reflection.PropertyInfo _anyKeyDown;
+        public bool anyKeyDown
+        {
+            get
+            {
+                if (_anyKeyDown == null) _anyKeyDown = GetInputType().GetProperty("anyKeyDown");
+                return _anyKeyDown != null && (bool)_anyKeyDown.GetValue(null, null);
+            }
+        }
+
+        public IEnumerable<KeyCode> SupportedKeyCodes { get; } = (KeyCode[])Enum.GetValues(typeof(KeyCode));
+    }
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -66,48 +66,51 @@ private void CreateWindowUI( int id )`
`66`	`66`	`{`
`67`	`67`	`AutoTranslationPlugin.Current.DisableAutoTranslator();`
`68`	`68`
	`69`	`+ float posy = GUIUtil.WindowTitleClearance + GUIUtil.ComponentSpacing;`
	`70`	`+`
`69`	`71`	`if( GUI.Button( GUIUtil.R( WindowWidth - 22, 2, 20, 16 ), "X" ) )`
`70`	`72`	`{`
`71`	`73`	`IsShown = false;`
`72`	`74`	`}`
`73`	`75`
`74`		`- GUILayout.Label( "Available Translators" );`
	`76`	`+ GUI.Label( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, WindowWidth - GUIUtil.ComponentSpacing, GUIUtil.LabelHeight ), "Available Translators" );`
	`77`	`+ posy += GUIUtil.LabelHeight + GUIUtil.HalfComponentSpacing;`
`75`	`78`
`76`		`- // GROUP`
`77`		`- _scrollPosition = GUILayout.BeginScrollView( _scrollPosition, GUI.skin.box );`
	`79`	`+ GUI.Box( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, WindowWidth - GUIUtil.ComponentSpacing, _toggles.Count * GUIUtil.RowHeight + GUIUtil.ComponentSpacing ), "" );`
	`80`	`+ posy += GUIUtil.HalfComponentSpacing;`
`78`	`81`
`79`	`82`	`foreach( var vm in _toggles )`
`80`	`83`	`{`
`81`	`84`	`var previousEnabled = GUI.enabled;`
`82`	`85`
`83`	`86`	`GUI.enabled = vm.Enabled;`
`84`	`87`	`var previousValue = vm.IsToggled();`
`85`		`- var newValue = GUILayout.Toggle( previousValue, vm.Text );`
	`88`	`+ var newValue = GUI.Toggle( GUIUtil.R( GUIUtil.ComponentSpacing, posy, WindowWidth - GUIUtil.ComponentSpacing * 2, GUIUtil.RowHeight ), previousValue, vm.Text );`
`86`	`89`	`if( previousValue != newValue )`
`87`	`90`	`{`
`88`	`91`	`vm.OnToggled();`
`89`	`92`	`}`
`90`	`93`
`91`	`94`	`GUI.enabled = previousEnabled;`
	`95`	`+ posy += GUIUtil.RowHeight;`
`92`	`96`	`}`
`93`	`97`
`94`		`- GUILayout.EndScrollView();`
	`98`	`+ posy += GUIUtil.HalfComponentSpacing + GUIUtil.ComponentSpacing;`
	`99`	`+`
	`100`	`+ GUI.Label( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, 60, GUIUtil.LabelHeight ), "Height" );`
	`101`	`+ _viewModel.Height = Mathf.Round( GUI.HorizontalSlider( GUIUtil.R( GUIUtil.HalfComponentSpacing + 60, posy + 5, WindowWidth - GUIUtil.ComponentSpacing * 2 - 60, GUIUtil.LabelHeight ), _viewModel.Height, 50, 300 ) );`
	`102`	`+ posy += GUIUtil.LabelHeight + GUIUtil.ComponentSpacing;`
`95`	`103`
`96`		`- GUILayout.BeginHorizontal();`
`97`		`- GUILayout.Label( "Height" );`
`98`		`- _viewModel.Height = Mathf.Round( GUILayout.HorizontalSlider( _viewModel.Height, 50, 300, GUILayout.MaxWidth( 250 ) ) );`
`99`		`- GUILayout.EndHorizontal();`
	`104`	`+ GUI.Label( GUIUtil.R( GUIUtil.HalfComponentSpacing, posy, 60, GUIUtil.LabelHeight ), "Width" );`
	`105`	`+ _viewModel.Width = Mathf.Round( GUI.HorizontalSlider( GUIUtil.R( GUIUtil.HalfComponentSpacing + 60, posy + 5, WindowWidth - GUIUtil.ComponentSpacing * 2 - 60, GUIUtil.LabelHeight ), _viewModel.Width, 200, 1000 ) );`
	`106`	`+ posy += GUIUtil.LabelHeight + GUIUtil.ComponentSpacing;`
`100`	`107`
`101`		`- GUILayout.BeginHorizontal();`
`102`		`- GUILayout.Label( "Width" );`
`103`		`- _viewModel.Width = Mathf.Round( GUILayout.HorizontalSlider( _viewModel.Width, 200, 1000, GUILayout.MaxWidth( 250 ) ) );`
`104`		`- GUILayout.EndHorizontal();`
	`108`	`+ _windowRect.height = posy + GUIUtil.ComponentSpacing;`
`105`	`109`
`106`	`110`	`GUI.DragWindow();`
`107`	`111`	`}`
`108`	`112`	`finally`
`109`	`113`	`{`
`110`		`-`
`111`	`114`	`AutoTranslationPlugin.Current.EnableAutoTranslator();`
`112`	`115`	`}`
`113`	`116`	`}`