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

fix crashy behavior in TextFieldWidget

Browse Source
This commit is contained in:
Chris Forbes
2011-05-16 21:54:03 +12:00
committed by Paul Chote
parent a96b1ce01c
commit aa772db9a7
5 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,13 +10,19 @@
using System;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Widgets
{
public class TextFieldWidget : Widget
{
public string Text = "";
string text = "";
public string Text
{
get { return text; }
set { text = value ?? ""; CursorPosition = CursorPosition.Clamp(0, text.Length); }
}
public int MaxLength = 0;
public bool Bold = false;
public int VisualHeight = 1;
@@ -68,10 +74,8 @@ namespace OpenRA.Widgets
public int ClosestCursorPosition(int x)
{
if (Text == null)
return 0;
var font = (Bold) ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"];
var textSize = font.Measure(Text);
var start = RenderOrigin.X + LeftMargin;
@@ -135,10 +139,8 @@ namespace OpenRA.Widgets
if (e.KeyName == "delete")
{
if (Text.Length > 0 && CursorPosition < Text.Length)
{
if (CursorPosition < Text.Length)
Text = Text.Remove(CursorPosition, 1);
}
return true;
}
@@ -148,16 +150,11 @@ namespace OpenRA.Widgets
public void TypeChar(KeyInput key)
{
if (Text == null)
Text = "";
if (key.KeyName == "backspace" && Text.Length > 0 && CursorPosition > 0)
if (key.KeyName == "backspace" && CursorPosition > 0)
{
Text = Text.Remove(CursorPosition - 1, 1);
CursorPosition--;
}
else if (key.KeyName == "delete" && Text.Length > 0 && CursorPosition < Text.Length - 1)
Text = Text.Remove(CursorPosition, 1);
}
else if (key.IsValidInput())
{
@@ -172,6 +169,7 @@ namespace OpenRA.Widgets
protected int blinkCycle = 10;
protected bool showCursor = true;
public override void Tick()
{
if (--blinkCycle <= 0)
@@ -185,14 +183,9 @@ namespace OpenRA.Widgets
public virtual void DrawWithString(string text)
{
if (text == null) text = "";
var font = (Bold) ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"];
var pos = RenderOrigin;
if (CursorPosition > text.Length)
CursorPosition = text.Length;
var textSize = font.Measure(text);
var cursorPosition = font.Measure(text.Substring(0,CursorPosition));
@@ -208,7 +201,8 @@ namespace OpenRA.Widgets
if (Focused)
textPos += new int2(Bounds.Width - LeftMargin - RightMargin - textSize.X, 0);
Game.Renderer.EnableScissor(pos.X + LeftMargin, pos.Y, Bounds.Width - LeftMargin - RightMargin, Bounds.Bottom);
Game.Renderer.EnableScissor(pos.X + LeftMargin, pos.Y,
Bounds.Width - LeftMargin - RightMargin, Bounds.Bottom);
}
font.DrawText(text, textPos, Color.White);