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

just fetch the font once in ChatDisplayWidget

Browse Source
This commit is contained in:
Chris Forbes
2011-09-24 21:51:18 +12:00
parent 9fcddc0df2
commit 1c2f857222
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Widgets/ChatDisplayWidget.cs
View File

@@ -33,16 +33,20 @@ namespace OpenRA.Widgets
: base(widget) { } : base(widget) { }
public override Rectangle EventBounds { get { return Rectangle.Empty; } } public override Rectangle EventBounds { get { return Rectangle.Empty; } }
public override void Draw() public override void Draw()
{ {
var pos = RenderOrigin; var pos = RenderOrigin;
var chatLogArea = new Rectangle(pos.X, pos.Y, Bounds.Width, Bounds.Height); var chatLogArea = new Rectangle(pos.X, pos.Y, Bounds.Width, Bounds.Height);
var chatpos = new int2(chatLogArea.X + 10, chatLogArea.Bottom - 6); var chatpos = new int2(chatLogArea.X + 10, chatLogArea.Bottom - 6);
if (DrawBackground) if (DrawBackground)
WidgetUtils.DrawPanel("dialog3", chatLogArea); WidgetUtils.DrawPanel("dialog3", chatLogArea);
var font = Game.Renderer.Fonts["Regular"];
Game.Renderer.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height); Game.Renderer.EnableScissor(chatLogArea.Left, chatLogArea.Top, chatLogArea.Width, chatLogArea.Height);
foreach (var line in recentLines.AsEnumerable().Reverse()) foreach (var line in recentLines.AsEnumerable().Reverse())
{ {
chatpos.Y -= 20; chatpos.Y -= 20;
@@ -51,30 +55,30 @@ namespace OpenRA.Widgets
if (!string.IsNullOrEmpty(line.Owner)) if (!string.IsNullOrEmpty(line.Owner))
{ {
var owner = line.Owner + ":"; var owner = line.Owner + ":";
inset = Game.Renderer.Fonts["Regular"].Measure(owner).X + 10; inset = font.Measure(owner).X + 10;
Game.Renderer.Fonts["Regular"].DrawTextWithContrast(owner, chatpos, font.DrawTextWithContrast(owner, chatpos,
line.Color, Color.Black, UseContrast ? 1 : 0); line.Color, Color.Black, UseContrast ? 1 : 0);
} }
Game.Renderer.Fonts["Regular"].DrawTextWithContrast(line.Text, chatpos + new int2(inset, 0), font.DrawTextWithContrast(line.Text, chatpos + new int2(inset, 0),
Color.White, Color.Black, UseContrast ? 1 : 0); Color.White, Color.Black, UseContrast ? 1 : 0);
} }
Game.Renderer.DisableScissor(); Game.Renderer.DisableScissor();
} }
public void AddLine(Color c, string from, string text) public void AddLine(Color c, string from, string text)
{ {
recentLines.Add(new ChatLine { Color = c, Owner = from, Text = text }); recentLines.Add(new ChatLine { Color = c, Owner = from, Text = text });
ticksUntilRemove = RemoveTime; ticksUntilRemove = RemoveTime;
if (Notification != null) if (Notification != null)
Sound.Play(Notification); Sound.Play(Notification);
while (recentLines.Count > logLength) recentLines.RemoveAt(0); while (recentLines.Count > logLength) recentLines.RemoveAt(0);
} }
public void RemoveLine() public void RemoveLine()
{ {
if (recentLines.Count > 0) recentLines.RemoveAt(0); if (recentLines.Count > 0) recentLines.RemoveAt(0);