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

Improves frame limit and player name text fields in settings menu.

Browse Source 
Esc key resets text field to unedited value and yields focus.
This commit is contained in:
deniz1a
2015-07-24 21:22:08 +03:00
parent 4fcf73921f
commit a51cc27fb5
1 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -191,14 +191,30 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var frameLimitTextfield = panel.Get<TextFieldWidget>("FRAME_LIMIT_TEXTFIELD"); var frameLimitTextfield = panel.Get<TextFieldWidget>("FRAME_LIMIT_TEXTFIELD");
frameLimitTextfield.Text = ds.MaxFramerate.ToString(); frameLimitTextfield.Text = ds.MaxFramerate.ToString();
var escPressed = false;
frameLimitTextfield.OnLoseFocus = () => frameLimitTextfield.OnLoseFocus = () =>
{ {
if (escPressed)
{
escPressed = false;
return;
}
int fps; int fps;
Exts.TryParseIntegerInvariant(frameLimitTextfield.Text, out fps); Exts.TryParseIntegerInvariant(frameLimitTextfield.Text, out fps);
ds.MaxFramerate = fps.Clamp(1, 1000); ds.MaxFramerate = fps.Clamp(1, 1000);
frameLimitTextfield.Text = ds.MaxFramerate.ToString(); frameLimitTextfield.Text = ds.MaxFramerate.ToString();
}; };
frameLimitTextfield.OnEnterKey = () => { frameLimitTextfield.YieldKeyboardFocus(); return true; }; frameLimitTextfield.OnEnterKey = () => { frameLimitTextfield.YieldKeyboardFocus(); return true; };
frameLimitTextfield.OnEscKey = () =>
{
frameLimitTextfield.Text = ds.MaxFramerate.ToString();
escPressed = true;
frameLimitTextfield.YieldKeyboardFocus();
return true;
};
frameLimitTextfield.IsDisabled = () => !ds.CapFramerate; frameLimitTextfield.IsDisabled = () => !ds.CapFramerate;
// Player profile // Player profile
@@ -207,11 +223,31 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var nameTextfield = panel.Get<TextFieldWidget>("PLAYERNAME"); var nameTextfield = panel.Get<TextFieldWidget>("PLAYERNAME");
nameTextfield.IsDisabled = () => worldRenderer.World.Type != WorldType.Shellmap; nameTextfield.IsDisabled = () => worldRenderer.World.Type != WorldType.Shellmap;
nameTextfield.Text = Settings.SanitizedPlayerName(ps.Name); nameTextfield.Text = Settings.SanitizedPlayerName(ps.Name);
nameTextfield.OnEnterKey = () => { nameTextfield.YieldKeyboardFocus(); return true; };
nameTextfield.OnLoseFocus = () => nameTextfield.OnLoseFocus = () =>
{ {
nameTextfield.Text = Settings.SanitizedPlayerName(nameTextfield.Text); if (escPressed)
ps.Name = nameTextfield.Text; {
escPressed = false;
return;
}
nameTextfield.Text = nameTextfield.Text.Trim();
if (nameTextfield.Text.Length == 0)
nameTextfield.Text = Settings.SanitizedPlayerName(ps.Name);
else
{
nameTextfield.Text = Settings.SanitizedPlayerName(nameTextfield.Text);
ps.Name = nameTextfield.Text;
}
};
nameTextfield.OnEnterKey = () => { nameTextfield.YieldKeyboardFocus(); return true; };
nameTextfield.OnEscKey = () =>
{
nameTextfield.Text = Settings.SanitizedPlayerName(ps.Name);
escPressed = true;
nameTextfield.YieldKeyboardFocus();
return true;
}; };
var colorPreview = panel.Get<ColorPreviewManagerWidget>("COLOR_MANAGER"); var colorPreview = panel.Get<ColorPreviewManagerWidget>("COLOR_MANAGER");
@@ -477,16 +513,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
BindHotkeyPref(kv, ks, developerTemplate, hotkeyList); BindHotkeyPref(kv, ks, developerTemplate, hotkeyList);
} }
return () => return () => { };
{
// Remove focus from the selected hotkey widget
// This is a bit of a hack, but works
if (Ui.KeyboardFocusWidget != null && panel.GetOrNull(Ui.KeyboardFocusWidget.Id) != null)
{
Ui.KeyboardFocusWidget.YieldKeyboardFocus();
Ui.KeyboardFocusWidget = null;
}
};
} }
Action ResetInputPanel(Widget panel) Action ResetInputPanel(Widget panel)