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

Use the font dictionary everywhere

Browse Source
This commit is contained in:
Paul Chote
2011-05-16 17:59:30 +12:00
parent e1c8658fdc
commit d7f009b218
17 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Widgets/ButtonWidget.cs
View File

@@ -86,7 +86,7 @@ namespace OpenRA.Widgets
public override void DrawInner()
{
var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
var font = (Bold) ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"];
var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0);
WidgetUtils.DrawPanel(Depressed ? "dialog3" : "dialog2", RenderBounds);

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

@@ -52,13 +52,13 @@ namespace OpenRA.Widgets
if (!string.IsNullOrEmpty(line.Owner))
{
var owner = line.Owner + ":";
inset = Game.Renderer.RegularFont.Measure(owner).X + 10;
inset = Game.Renderer.Fonts["Regular"].Measure(owner).X + 10;
Game.Renderer.RegularFont.DrawTextWithContrast(owner, chatpos,
Game.Renderer.Fonts["Regular"].DrawTextWithContrast(owner, chatpos,
line.Color, Color.Black, UseContrast ? 1 : 0);
}
Game.Renderer.RegularFont.DrawTextWithContrast(line.Text, chatpos + new int2(inset, 0),
Game.Renderer.Fonts["Regular"].DrawTextWithContrast(line.Text, chatpos + new int2(inset, 0),
Color.White, Color.Black, UseContrast ? 1 : 0);
}

6
OpenRA.Game/Widgets/ChatEntryWidget.cs
View File

@@ -39,10 +39,10 @@ namespace OpenRA.Widgets
if (composing)
{
var text = teamChat ? "Chat (Team): " : "Chat (All): ";
var w = Game.Renderer.BoldFont.Measure(text).X;
var w = Game.Renderer.Fonts["Bold"].Measure(text).X;
Game.Renderer.BoldFont.DrawTextWithContrast(text, RenderOrigin + new float2(3, 7), Color.White, Color.Black, UseContrast ? 1 : 0);
Game.Renderer.RegularFont.DrawTextWithContrast(content, RenderOrigin + new float2(3 + w, 7), Color.White, Color.Black, UseContrast ? 1 : 0);
Game.Renderer.Fonts["Bold"].DrawTextWithContrast(text, RenderOrigin + new float2(3, 7), Color.White, Color.Black, UseContrast ? 1 : 0);
Game.Renderer.Fonts["Regular"].DrawTextWithContrast(content, RenderOrigin + new float2(3 + w, 7), Color.White, Color.Black, UseContrast ? 1 : 0);
}
}

2
OpenRA.Game/Widgets/CheckboxWidget.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Widgets
public override void DrawInner()
{
var font = Bold ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
var font = Bold ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"];
var pos = RenderOrigin;
var rect = RenderBounds;
var check = new Rectangle(rect.Location,

2
OpenRA.Game/Widgets/PerfGraphWidget.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Widgets
u + new float2(12, 10 * k + 4),
item.c, item.c);
Game.Renderer.TinyFont.DrawText(item.Name, new float2(rect.Left, rect.Top) + new float2(18, 10 * k - 3), Color.White);
Game.Renderer.Fonts["Tiny"].DrawText(item.Name, new float2(rect.Left, rect.Top) + new float2(18, 10 * k - 3), Color.White);
Game.Renderer.Flush();
++k;
}

2
OpenRA.Game/Widgets/ScrollingTextWidget.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Widgets
if (bg != null)
WidgetUtils.DrawPanel(bg, RenderBounds);
var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
var font = (Bold) ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"];
var text = GetText();
if (text == null)
return;

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

@@ -71,7 +71,7 @@ namespace OpenRA.Widgets
if (Text == null)
return 0;
var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
var font = (Bold) ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"];
var textSize = font.Measure(Text);
var start = RenderOrigin.X + LeftMargin;
@@ -187,7 +187,7 @@ namespace OpenRA.Widgets
{
if (text == null) text = "";
var font = (Bold) ? Game.Renderer.BoldFont : Game.Renderer.RegularFont;
var font = (Bold) ? Game.Renderer.Fonts["Bold"] : Game.Renderer.Fonts["Regular"];
var pos = RenderOrigin;
if (CursorPosition > text.Length)

4
OpenRA.Game/Widgets/TimerWidget.cs
View File

@@ -26,10 +26,10 @@ namespace OpenRA.Widgets
public override void DrawInner()
{
var s = WidgetUtils.FormatTime(Game.LocalTick);
var size = Game.Renderer.TitleFont.Measure(s);
var size = Game.Renderer.Fonts["Title"].Measure(s);
var pos = new float2(RenderBounds.Left - size.X / 2, RenderBounds.Top - 20);
Game.Renderer.TitleFont.DrawTextWithContrast(s, pos, Color.White, Color.Black, 1);
Game.Renderer.Fonts["Title"].DrawTextWithContrast(s, pos, Color.White, Color.Black, 1);
}
}
}