epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix map editor sliders stealing focus

Browse Source
This commit is contained in:
Gustas
2022-12-05 19:38:40 +02:00
committed by abcdefg30
parent e60f7bb125
commit c739447598
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorEditLogic.cs
View File

@@ -41,6 +41,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly BackgroundWidget actorEditPanel; readonly BackgroundWidget actorEditPanel;
readonly LabelWidget typeLabel; readonly LabelWidget typeLabel;
readonly TextFieldWidget actorIDField; readonly TextFieldWidget actorIDField;
readonly HashSet<TextFieldWidget> typableFields = new HashSet<TextFieldWidget>();
readonly LabelWidget actorIDErrorLabel; readonly LabelWidget actorIDErrorLabel;
readonly Widget initContainer; readonly Widget initContainer;
@@ -328,6 +329,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (float.TryParse(valueField.Text, out var result)) if (float.TryParse(valueField.Text, out var result))
slider.UpdateValue(result); slider.UpdateValue(result);
}; };
valueField.OnEscKey = _ => { valueField.YieldKeyboardFocus(); return true; };
valueField.OnEnterKey = _ => { valueField.YieldKeyboardFocus(); return true; };
typableFields.Add(valueField);
} }
initContainer.AddChild(sliderContainer); initContainer.AddChild(sliderContainer);
@@ -402,6 +407,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void Close() void Close()
{ {
actorIDField.YieldKeyboardFocus(); actorIDField.YieldKeyboardFocus();
foreach (var f in typableFields)
f.YieldKeyboardFocus();
editor.DefaultBrush.SelectedActor = null; editor.DefaultBrush.SelectedActor = null;
CurrentActor = null; CurrentActor = null;
} }