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

Remove duplication from PasswordFieldWidget.

Browse Source
This commit is contained in:
Paul Chote
2010-11-23 12:20:31 +13:00
parent 3d1d4a1aff
commit 2072b78489
2 changed files with 13 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenRA.Game/Widgets/PasswordFieldWidget.cs
View File

@@ -16,46 +16,13 @@ namespace OpenRA.Widgets
{
public class PasswordFieldWidget : TextFieldWidget
{
public PasswordFieldWidget()
: base()
{
}
protected PasswordFieldWidget(PasswordFieldWidget widget)
: base(widget)
{
}
public PasswordFieldWidget() : base() {}
protected PasswordFieldWidget(PasswordFieldWidget widget) : base(widget) {}
public override void DrawInner( WorldRenderer wr )
{
int margin = 5;
var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
var cursor = (showCursor && Focused) ? "|" : "";
var textSize = font.Measure(new string('*', Text.Length) + "|");
var pos = RenderOrigin;
WidgetUtils.DrawPanel("dialog3",
new Rectangle(pos.X, pos.Y, Bounds.Width, Bounds.Height));
// Inset text by the margin and center vertically
var textPos = pos + new int2(margin, (Bounds.Height - textSize.Y) / 2 - VisualHeight);
// Right align when editing and scissor when the text overflows
if (textSize.X > Bounds.Width - 2 * margin)
{
if (Focused)
textPos += new int2(Bounds.Width - 2 * margin - textSize.X, 0);
Game.Renderer.EnableScissor(pos.X + margin, pos.Y, Bounds.Width - 2 * margin, Bounds.Bottom);
}
font.DrawText(new string('*', Text.Length) + cursor, textPos, Color.White);
if (textSize.X > Bounds.Width - 2 * margin)
Game.Renderer.DisableScissor();
DrawWithString(new string('*', Text.Length));
}
public override Widget Clone() { return new PasswordFieldWidget(this); }
}
}

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

@@ -24,11 +24,7 @@ namespace OpenRA.Widgets
public Func<bool> OnTabKey = () => false;
public Action OnLoseFocus = () => { };
public TextFieldWidget()
: base()
{
}
public TextFieldWidget() : base() {}
protected TextFieldWidget(TextFieldWidget widget)
: base(widget)
{
@@ -108,12 +104,12 @@ namespace OpenRA.Widgets
base.Tick();
}
public override void DrawInner( WorldRenderer wr )
public virtual void DrawWithString(string text)
{
int margin = 5;
var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
var cursor = (showCursor && Focused) ? "|" : "";
var textSize = font.Measure(Text + "|");
var textSize = font.Measure(text + "|");
var pos = RenderOrigin;
WidgetUtils.DrawPanel("dialog3",
@@ -131,11 +127,16 @@ namespace OpenRA.Widgets
Game.Renderer.EnableScissor(pos.X + margin, pos.Y, Bounds.Width - 2 * margin, Bounds.Bottom);
}
font.DrawText(Text + cursor, textPos, Color.White);
font.DrawText(text + cursor, textPos, Color.White);
if (textSize.X > Bounds.Width - 2 * margin)
Game.Renderer.DisableScissor();
}
public override void DrawInner( WorldRenderer wr )
{
DrawWithString(Text);
}
public override Widget Clone() { return new TextFieldWidget(this); }
}