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

Add hotkeys for TextFieldWidget including:

Browse Source 
- ctrl+left/ctrl+right (cmd on osx) (back/forward by a word)
- ctrl+backspace/ctrl+delete (alt on osx) (delete word)
- ctrl+k/ctrl+u (cmd+delete/cmd+backspace on osx) (delete line from cursor)
- ctrl+x (cmd on osx) (deletes line)
This commit is contained in:
Kevin Azzam
2015-10-09 23:56:19 +02:00
parent 50679cd6c4
commit 96c30788b0
1 changed files with 107 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
OpenRA.Mods.Common/Widgets/TextFieldWidget.cs
View File

@@ -127,18 +127,51 @@ namespace OpenRA.Mods.Common.Widgets
if (e.Key == Keycode.LALT && OnAltKey()) if (e.Key == Keycode.LALT && OnAltKey())
return true; return true;
Func<int> getPrevWhitespaceIndex = () =>
Text.Substring(0, CursorPosition).TrimEnd().LastIndexOf(' ') + 1;
Func<int> getNextWhitespaceIndex = () => {
var substr_len = Text.Substring(CursorPosition).Length;
var substr_trimmed = Text.Substring(CursorPosition).TrimStart();
var trimmed_spaces = substr_len - substr_trimmed.Length;
var next_whitespace = substr_trimmed.IndexOf(' ');
if (next_whitespace == -1)
return Text.Length;
else
return CursorPosition + trimmed_spaces + next_whitespace;
};
if (e.Key == Keycode.LEFT) if (e.Key == Keycode.LEFT)
{ {
if (CursorPosition > 0) if (CursorPosition > 0)
CursorPosition--; {
if ((Platform.CurrentPlatform != PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Ctrl)) ||
(Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Alt)))
{
CursorPosition = getPrevWhitespaceIndex();
}
else
{
CursorPosition--;
}
}
return true; return true;
} }
if (e.Key == Keycode.RIGHT) if (e.Key == Keycode.RIGHT)
{ {
if (CursorPosition <= Text.Length - 1) if (CursorPosition <= Text.Length - 1) {
CursorPosition++; if ((Platform.CurrentPlatform != PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Ctrl)) ||
(Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Alt)))
{
CursorPosition = getNextWhitespaceIndex();
}
else
{
CursorPosition++;
}
}
return true; return true;
} }
@@ -155,11 +188,61 @@ namespace OpenRA.Mods.Common.Widgets
return true; return true;
} }
if (e.Key == Keycode.K && e.Modifiers.HasModifier(Modifiers.Ctrl) &&
(Platform.CurrentPlatform != PlatformType.OSX))
{
// equivalent to cmd+delete on osx
if (CursorPosition < Text.Length)
{
Text = Text.Remove(CursorPosition);
OnTextEdited();
}
return true;
}
if (e.Key == Keycode.U && e.Modifiers.HasModifier(Modifiers.Ctrl) &&
(Platform.CurrentPlatform != PlatformType.OSX))
{
// equivalent to cmd+backspace on osx
Text = Text.Substring(CursorPosition);
CursorPosition = 0;
OnTextEdited();
return true;
}
if (e.Key == Keycode.X &&
((Platform.CurrentPlatform != PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Ctrl)) ||
(Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Meta))))
{
if (!string.IsNullOrEmpty(Text))
{
Text = Text.Remove(0);
CursorPosition = 0;
OnTextEdited();
return true;
}
}
if (e.Key == Keycode.DELETE) if (e.Key == Keycode.DELETE)
{ {
if (CursorPosition < Text.Length) if (CursorPosition < Text.Length)
{ {
Text = Text.Remove(CursorPosition, 1); if ((Platform.CurrentPlatform != PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Ctrl)) ||
(Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Alt)))
{
Text = Text.Substring(0, CursorPosition) + Text.Substring(getNextWhitespaceIndex());
}
else if (Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Meta))
{
// equivalent to ctrl+k on non-osx
Text = Text.Remove(CursorPosition);
}
else
{
Text = Text.Remove(CursorPosition, 1);
}
OnTextEdited(); OnTextEdited();
} }
@@ -168,8 +251,25 @@ namespace OpenRA.Mods.Common.Widgets
if (e.Key == Keycode.BACKSPACE && CursorPosition > 0) if (e.Key == Keycode.BACKSPACE && CursorPosition > 0)
{ {
CursorPosition--; if ((Platform.CurrentPlatform != PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Ctrl)) ||
Text = Text.Remove(CursorPosition, 1); (Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Alt)))
{
var prev_whitespace = getPrevWhitespaceIndex();
Text = Text.Substring(0, prev_whitespace) + Text.Substring(CursorPosition);
CursorPosition = prev_whitespace;
}
else if (Platform.CurrentPlatform == PlatformType.OSX && e.Modifiers.HasModifier(Modifiers.Meta))
{
// equivalent to ctrl+u on non-osx
Text = Text.Substring(CursorPosition);
CursorPosition = 0;
}
else
{
CursorPosition--;
Text = Text.Remove(CursorPosition, 1);
}
OnTextEdited(); OnTextEdited();
return true; return true;
} }
@@ -284,4 +384,4 @@ namespace OpenRA.Mods.Common.Widgets
public override Widget Clone() { return new TextFieldWidget(this); } public override Widget Clone() { return new TextFieldWidget(this); }
} }
} }