From 9646dd3fc2cf95845a8c6e75a277de9df0ff84f2 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 15 Jul 2025 12:33:33 +0200 Subject: [PATCH] Fix `AutoFocus` on `ContainerControl` to be `false` by default --- Source/Editor/GUI/ContextMenu/ContextMenuBase.cs | 3 ++- Source/Editor/GUI/Dialogs/ColorSelector.cs | 2 ++ Source/Editor/GUI/Docking/DockPanelProxy.cs | 2 -- Source/Editor/GUI/Input/SliderControl.cs | 2 ++ Source/Editor/GUI/Tree/TreeNode.cs | 2 ++ Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs | 2 ++ Source/Editor/Surface/Elements/BoxValue.cs | 1 + Source/Editor/Surface/SurfaceControl.cs | 1 + Source/Engine/UI/GUI/Common/Dropdown.cs | 2 ++ Source/Engine/UI/GUI/Common/Slider.cs | 2 ++ Source/Engine/UI/GUI/Common/TextBoxBase.cs | 2 ++ Source/Engine/UI/GUI/ContainerControl.cs | 4 ++++ Source/Engine/UI/GUI/Special/RadialMenu.cs | 2 ++ 13 files changed, 24 insertions(+), 3 deletions(-) diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs index d7534b15b..0261792e7 100644 --- a/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs +++ b/Source/Editor/GUI/ContextMenu/ContextMenuBase.cs @@ -114,9 +114,10 @@ namespace FlaxEditor.GUI.ContextMenu public ContextMenuBase() : base(0, 0, 120, 32) { - _direction = ContextMenuDirection.RightDown; Visible = false; + AutoFocus = true; + _direction = ContextMenuDirection.RightDown; _isSubMenu = true; } diff --git a/Source/Editor/GUI/Dialogs/ColorSelector.cs b/Source/Editor/GUI/Dialogs/ColorSelector.cs index 126959d85..f556e8cd6 100644 --- a/Source/Editor/GUI/Dialogs/ColorSelector.cs +++ b/Source/Editor/GUI/Dialogs/ColorSelector.cs @@ -76,6 +76,8 @@ namespace FlaxEditor.GUI.Dialogs public ColorSelector(float wheelSize) : base(0, 0, wheelSize, wheelSize) { + AutoFocus = true; + _colorWheelSprite = Editor.Instance.Icons.ColorWheel128; _wheelRect = new Rectangle(0, 0, wheelSize, wheelSize); } diff --git a/Source/Editor/GUI/Docking/DockPanelProxy.cs b/Source/Editor/GUI/Docking/DockPanelProxy.cs index dbb4e082e..5cf64266a 100644 --- a/Source/Editor/GUI/Docking/DockPanelProxy.cs +++ b/Source/Editor/GUI/Docking/DockPanelProxy.cs @@ -65,8 +65,6 @@ namespace FlaxEditor.GUI.Docking internal DockPanelProxy(DockPanel panel) : base(0, 0, 64, 64) { - AutoFocus = false; - _panel = panel; AnchorPreset = AnchorPresets.StretchAll; Offsets = Margin.Zero; diff --git a/Source/Editor/GUI/Input/SliderControl.cs b/Source/Editor/GUI/Input/SliderControl.cs index 8e3efe956..4703da73d 100644 --- a/Source/Editor/GUI/Input/SliderControl.cs +++ b/Source/Editor/GUI/Input/SliderControl.cs @@ -368,6 +368,8 @@ namespace FlaxEditor.GUI.Input public SliderControl(float value, float x = 0, float y = 0, float width = 120, float min = float.MinValue, float max = float.MaxValue) : base(x, y, width, TextBox.DefaultHeight) { + AutoFocus = true; + _min = min; _max = max; _value = Mathf.Clamp(value, min, max); diff --git a/Source/Editor/GUI/Tree/TreeNode.cs b/Source/Editor/GUI/Tree/TreeNode.cs index 40c276bf4..ed1257819 100644 --- a/Source/Editor/GUI/Tree/TreeNode.cs +++ b/Source/Editor/GUI/Tree/TreeNode.cs @@ -319,6 +319,8 @@ namespace FlaxEditor.GUI.Tree public TreeNode(bool canChangeOrder, SpriteHandle iconCollapsed, SpriteHandle iconOpened) : base(0, 0, 64, 16) { + AutoFocus = true; + _canChangeOrder = canChangeOrder; _animationProgress = 1.0f; _cachedHeight = _headerHeight; diff --git a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs index bd92bd266..450960af7 100644 --- a/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs +++ b/Source/Editor/Surface/Archetypes/Animation.MultiBlend.cs @@ -233,6 +233,8 @@ namespace FlaxEditor.Surface.Archetypes public BlendPointsEditor(Animation.MultiBlend node, bool is2D, float x, float y, float width, float height) : base(x, y, width, height) { + AutoFocus = true; + _node = node; _is2D = is2D; } diff --git a/Source/Editor/Surface/Elements/BoxValue.cs b/Source/Editor/Surface/Elements/BoxValue.cs index 597c11b9e..05d39580c 100644 --- a/Source/Editor/Surface/Elements/BoxValue.cs +++ b/Source/Editor/Surface/Elements/BoxValue.cs @@ -64,6 +64,7 @@ namespace FlaxEditor.Surface.Elements { ParentNode = parentNode; Archetype = archetype; + AutoFocus = true; var back = Style.Current.TextBoxBackground; var grayOutFactor = 0.6f; diff --git a/Source/Editor/Surface/SurfaceControl.cs b/Source/Editor/Surface/SurfaceControl.cs index 46cb94577..ce5b17d86 100644 --- a/Source/Editor/Surface/SurfaceControl.cs +++ b/Source/Editor/Surface/SurfaceControl.cs @@ -59,6 +59,7 @@ namespace FlaxEditor.Surface protected SurfaceControl(VisjectSurfaceContext context, float width, float height) : base(0, 0, width, height) { + AutoFocus = true; ClipChildren = false; Surface = context.Surface; diff --git a/Source/Engine/UI/GUI/Common/Dropdown.cs b/Source/Engine/UI/GUI/Common/Dropdown.cs index c0a81eacf..868db4b89 100644 --- a/Source/Engine/UI/GUI/Common/Dropdown.cs +++ b/Source/Engine/UI/GUI/Common/Dropdown.cs @@ -381,6 +381,8 @@ namespace FlaxEngine.GUI public Dropdown() : base(0, 0, 120, 18.0f) { + AutoFocus = true; + var style = Style.Current; Font = new FontReference(style.FontMedium); TextColor = style.Foreground; diff --git a/Source/Engine/UI/GUI/Common/Slider.cs b/Source/Engine/UI/GUI/Common/Slider.cs index c1e7cd9f6..e02b67ab2 100644 --- a/Source/Engine/UI/GUI/Common/Slider.cs +++ b/Source/Engine/UI/GUI/Common/Slider.cs @@ -298,6 +298,8 @@ public class Slider : ContainerControl public Slider(float width, float height) : base(0, 0, width, height) { + AutoFocus = true; + var style = Style.Current; TrackLineColor = style.BackgroundHighlighted; TrackFillLineColor = style.LightBackground; diff --git a/Source/Engine/UI/GUI/Common/TextBoxBase.cs b/Source/Engine/UI/GUI/Common/TextBoxBase.cs index 237a1bb5f..243e4786e 100644 --- a/Source/Engine/UI/GUI/Common/TextBoxBase.cs +++ b/Source/Engine/UI/GUI/Common/TextBoxBase.cs @@ -511,6 +511,8 @@ namespace FlaxEngine.GUI protected TextBoxBase(bool isMultiline, float x, float y, float width = 120) : base(x, y, width, DefaultHeight) { + AutoFocus = true; + _isMultiline = isMultiline; _maxLength = 2147483646; _selectionStart = _selectionEnd = -1; diff --git a/Source/Engine/UI/GUI/ContainerControl.cs b/Source/Engine/UI/GUI/ContainerControl.cs index 017b8ee5c..ada93ff1e 100644 --- a/Source/Engine/UI/GUI/ContainerControl.cs +++ b/Source/Engine/UI/GUI/ContainerControl.cs @@ -38,6 +38,7 @@ namespace FlaxEngine.GUI public ContainerControl() { _isLayoutLocked = true; + AutoFocus = false; } /// @@ -47,6 +48,7 @@ namespace FlaxEngine.GUI : base(x, y, width, height) { _isLayoutLocked = true; + AutoFocus = false; } /// @@ -56,6 +58,7 @@ namespace FlaxEngine.GUI : base(location, size) { _isLayoutLocked = true; + AutoFocus = false; } /// @@ -63,6 +66,7 @@ namespace FlaxEngine.GUI : base(bounds) { _isLayoutLocked = true; + AutoFocus = false; } /// diff --git a/Source/Engine/UI/GUI/Special/RadialMenu.cs b/Source/Engine/UI/GUI/Special/RadialMenu.cs index 3fbaa2fe2..060c4ef90 100644 --- a/Source/Engine/UI/GUI/Special/RadialMenu.cs +++ b/Source/Engine/UI/GUI/Special/RadialMenu.cs @@ -165,6 +165,8 @@ namespace FlaxEngine.GUI public RadialMenu(float x, float y, float width = 100, float height = 100) : base(x, y, width, height) { + AutoFocus = true; + var style = Style.Current; if (style != null) {