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

Fix bogus handling of special keyboard characters everywhere else. Textfields now only accept valid characters, support right-delete.

Browse Source
This commit is contained in:
Paul Chote
2011-03-18 10:48:12 +13:00
parent 7d6d488176
commit eb69b697b1
9 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Widgets/ChatEntryWidget.cs
View File

@@ -56,7 +56,7 @@ namespace OpenRA.Widgets
{
if (e.Event == KeyInputEvent.Up) return false;
if (e.KeyChar == '\r')
if (e.KeyName == "return" || e.KeyName == "enter" )
{
if (composing)
{
@@ -94,15 +94,15 @@ namespace OpenRA.Widgets
if (composing)
{
if (e.KeyChar == '\b' || e.KeyChar == 0x7f)
if (e.KeyName == "backspace")
{
if (content.Length > 0)
content = content.Remove(content.Length - 1);
return true;
}
else if (!char.IsControl(e.KeyChar))
else if (e.IsValidInput())
{
content += e.KeyChar;
content += e.UnicodeChar.ToString();
return true;
}

34
OpenRA.Game/Widgets/TextFieldWidget.cs
View File

@@ -95,10 +95,10 @@ namespace OpenRA.Widgets
if (!Focused)
return false;
if (e.KeyChar == '\r' && OnEnterKey())
if ((e.KeyName == "return" || e.KeyName == "enter") && OnEnterKey())
return true;
if (e.KeyChar == '\t' && OnTabKey())
if (e.KeyName == "tab" && OnTabKey())
return true;
if (e.KeyName == "left")
@@ -126,31 +126,29 @@ namespace OpenRA.Widgets
return true;
}
TypeChar(e.KeyChar);
TypeChar(e);
return true;
}
public void TypeChar(char c)
public void TypeChar(KeyInput key)
{
// backspace
if (c == '\b' || c == 0x7f)
if (Text == null)
Text = "";
if (key.KeyName == "backspace" && Text.Length > 0 && CursorPosition > 0)
{
if (Text.Length > 0 && CursorPosition > 0)
{
Text = Text.Remove(CursorPosition - 1, 1);
CursorPosition--;
}
Text = Text.Remove(CursorPosition - 1, 1);
CursorPosition--;
}
else if (!char.IsControl(c))
{
if (Text == null)
Text = "";
else if (key.KeyName == "delete" && Text.Length > 0 && CursorPosition < Text.Length - 1)
Text = Text.Remove(CursorPosition, 1);
else if (key.IsValidInput())
{
if (MaxLength > 0 && Text.Length >= MaxLength)
return;
Text = Text.Insert(CursorPosition, c.ToString());
Text = Text.Insert(CursorPosition, key.UnicodeChar.ToString());
CursorPosition++;
}

2
OpenRA.Game/Widgets/VqaPlayerWidget.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Widgets
{
if (e.Event == KeyInputEvent.Down)
{
if (e.KeyChar == 27) // Escape
if (e.KeyName == "escape")
{
Stop();
return true;