Move ManualTextInput to a separate class

Author: frenzibyte

osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxEvents.cs

@@ -12,6 +12,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Testing;
+using osu.Framework.Testing.Input;
 using osuTK;
 using osuTK.Input;
 
@@ -20,7 +21,7 @@ namespace osu.Framework.Tests.Visual.UserInterface
     public partial class TestSceneTextBoxEvents : ManualInputManagerTestScene
     {
         private EventQueuesTextBox textBox;
-        private ManualTextInput textInput;
+        private ManualTextInputSource textInput;
         private ManualTextInputContainer textInputContainer;
 
         private const string default_text = "some default text";
@@ -618,57 +619,12 @@ protected override void OnImeResult(string result, bool successful) =>
         public partial class ManualTextInputContainer : Container
         {
             [Cached(typeof(TextInputSource))]
-            public readonly ManualTextInput TextInput;
+            public readonly ManualTextInputSource TextInput;
 
             public ManualTextInputContainer()
             {
                 RelativeSizeAxes = Axes.Both;
-                TextInput = new ManualTextInput();
-            }
-        }
-
-        public class ManualTextInput : TextInputSource
-        {
-            public void Text(string text) => TriggerTextInput(text);
-
-            public new void TriggerImeComposition(string text, int start, int length)
-            {
-                base.TriggerImeComposition(text, start, length);
-            }
-
-            public new void TriggerImeResult(string text)
-            {
-                base.TriggerImeResult(text);
-            }
-
-            public override void ResetIme()
-            {
-                base.ResetIme();
-
-                // this call will be somewhat delayed in a real world scenario, but let's run it immediately for simplicity.
-                base.TriggerImeComposition(string.Empty, 0, 0);
-            }
-
-            public readonly Queue<bool> ActivationQueue = new Queue<bool>();
-            public readonly Queue<bool> EnsureActivatedQueue = new Queue<bool>();
-            public readonly Queue<bool> DeactivationQueue = new Queue<bool>();
-
-            protected override void ActivateTextInput(bool allowIme)
-            {
-                base.ActivateTextInput(allowIme);
-                ActivationQueue.Enqueue(allowIme);
-            }
-
-            protected override void EnsureTextInputActivated(bool allowIme)
-            {
-                base.EnsureTextInputActivated(allowIme);
-                EnsureActivatedQueue.Enqueue(allowIme);
-            }
-
-            protected override void DeactivateTextInput()
-            {
-                base.DeactivateTextInput();
-                DeactivationQueue.Enqueue(true);
+                TextInput = new ManualTextInputSource();
             }
         }
 

osu.Framework.Tests/Visual/UserInterface/TestSceneTextBoxKeyEvents.cs

@@ -11,6 +11,7 @@
 using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Framework.Testing;
+using osu.Framework.Testing.Input;
 using osuTK;
 using osuTK.Input;
 
@@ -20,7 +21,7 @@ public partial class TestSceneTextBoxKeyEvents : ManualInputManagerTestScene
     {
         private KeyEventQueuesTextBox textBox;
 
-        private TestSceneTextBoxEvents.ManualTextInput textInput;
+        private ManualTextInputSource textInput;
 
         [Resolved]
         private GameHost host { get; set; }

osu.Framework/Testing/Input/ManualTextInputSource.cs

@@ -0,0 +1,53 @@
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Input;
+
+namespace osu.Framework.Testing.Input
+{
+    public class ManualTextInputSource : TextInputSource
+    {
+        public readonly Queue<bool> ActivationQueue = new Queue<bool>();
+        public readonly Queue<bool> EnsureActivatedQueue = new Queue<bool>();
+        public readonly Queue<bool> DeactivationQueue = new Queue<bool>();
+
+        public void Text(string text) => TriggerTextInput(text);
+
+        public new void TriggerImeComposition(string text, int start, int length)
+        {
+            base.TriggerImeComposition(text, start, length);
+        }
+
+        public new void TriggerImeResult(string text)
+        {
+            base.TriggerImeResult(text);
+        }
+
+        public override void ResetIme()
+        {
+            base.ResetIme();
+
+            // this call will be somewhat delayed in a real world scenario, but let's run it immediately for simplicity.
+            base.TriggerImeComposition(string.Empty, 0, 0);
+        }
+
+        protected override void ActivateTextInput(bool allowIme)
+        {
+            base.ActivateTextInput(allowIme);
+            ActivationQueue.Enqueue(allowIme);
+        }
+
+        protected override void EnsureTextInputActivated(bool allowIme)
+        {
+            base.EnsureTextInputActivated(allowIme);
+            EnsureActivatedQueue.Enqueue(allowIme);
+        }
+
+        protected override void DeactivateTextInput()
+        {
+            base.DeactivateTextInput();
+            DeactivationQueue.Enqueue(true);
+        }
+    }
+}