Merge branch 'ui' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-ui

2021-03-18 11:09:28 +01:00
parent 00842e89cb c8b57d417c
commit 8078b9543d
9 changed files with 42 additions and 33 deletions
--- a/Source/Engine/UI/GUI/Common/TextBoxBase.cs
+++ b/Source/Engine/UI/GUI/Common/TextBoxBase.cs
@@ -9,7 +9,7 @@ namespace FlaxEngine.GUI
    /// <summary>
    /// Base class for all text box controls which can gather text input from the user.
    /// </summary>
-    public abstract class TextBoxBase : Control
+    public abstract class TextBoxBase : ContainerControl
    {
        /// <summary>
        /// The text separators (used for words skipping).