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

Remove TextField focus when becoming disabled. Fixes #4153.

Browse Source
This commit is contained in:
Paul Chote
2013-12-03 18:36:20 +13:00
parent 599faba94e
commit 701e9e2684
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,6 +163,9 @@ namespace OpenRA.Widgets
public override bool HandleTextInput(string text) public override bool HandleTextInput(string text)
{ {
if (!HasKeyboardFocus || IsDisabled())
return false;
if (MaxLength > 0 && Text.Length >= MaxLength) if (MaxLength > 0 && Text.Length >= MaxLength)
return true; return true;
@@ -175,8 +178,18 @@ namespace OpenRA.Widgets
protected int blinkCycle = 10; protected int blinkCycle = 10;
protected bool showCursor = true; protected bool showCursor = true;
bool wasDisabled;
public override void Tick() public override void Tick()
{ {
// Remove the blicking cursor when disabled
var isDisabled = IsDisabled();
if (isDisabled != wasDisabled)
{
wasDisabled = isDisabled;
if (isDisabled && Ui.KeyboardFocusWidget == this)
YieldKeyboardFocus();
}
if (--blinkCycle <= 0) if (--blinkCycle <= 0)
{ {
blinkCycle = 20; blinkCycle = 20;