DefaultInputControllerWidget should not ever consume input it doesnt want

This commit is contained in:
Chris Forbes
2010-07-25 21:13:42 +12:00
committed by Paul Chote
parent 43a488ed6d
commit 882d94a22a

View File

@@ -160,31 +160,37 @@ namespace OpenRA.Widgets
if (e.Event == KeyInputEvent.Down) if (e.Event == KeyInputEvent.Down)
{ {
switch (e.KeyName) switch (e.KeyName)
{ {
case "up": scrollUp = true; break; case "up": scrollUp = true; return true;
case "down": scrollDown = true; break; case "down": scrollDown = true; return true;
case "left": scrollLeft = true; break; case "left": scrollLeft = true; return true;
case "right": scrollRight = true; break; case "right": scrollRight = true; return true;
}
if (e.KeyName.Length == 1 && char.IsDigit(e.KeyName[0]))
{
Game.world.Selection.DoControlGroup(Game.world, e.KeyName[0] - '0', e.Modifiers);
return true;
}
if (e.KeyChar == 08)
{
GotoNextBase();
return true;
} }
if (e.KeyName.Length == 1 && char.IsDigit(e.KeyName[0]))
Game.world.Selection.DoControlGroup(Game.world, e.KeyName[0] - '0', e.Modifiers);
if (e.KeyChar == 08)
GotoNextBase();
} }
else else
{ {
switch (e.KeyName) switch (e.KeyName)
{ {
case "up": scrollUp = false; break; case "up": scrollUp = false; return true;
case "down": scrollDown = false; break; case "down": scrollDown = false; return true;
case "left": scrollLeft = false; break; case "left": scrollLeft = false; return true;
case "right": scrollRight = false; break; case "right": scrollRight = false; return true;
} }
} }
return true; return false;
} }
public override void Tick(World world) public override void Tick(World world)