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

Replace use of Contrast with Shadow for ingame chat and support power timers

Browse Source
This commit is contained in:
Oliver Brakmann
2016-08-31 20:55:22 +02:00
parent 38c16e4f7a
commit 624e69e97b
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.Common/Widgets/ChatDisplayWidget.cs
View File

@@ -21,6 +21,7 @@ namespace OpenRA.Mods.Common.Widgets
{ {
public readonly int RemoveTime = 0; public readonly int RemoveTime = 0;
public readonly bool UseContrast = false; public readonly bool UseContrast = false;
public readonly bool UseShadow = false;
public readonly Color BackgroundColorDark = ChromeMetrics.Get<Color>("TextContrastColorDark"); public readonly Color BackgroundColorDark = ChromeMetrics.Get<Color>("TextContrastColorDark");
public readonly Color BackgroundColorLight = ChromeMetrics.Get<Color>("TextContrastColorLight"); public readonly Color BackgroundColorLight = ChromeMetrics.Get<Color>("TextContrastColorLight");
public string Notification = ""; public string Notification = "";
@@ -58,12 +59,24 @@ namespace OpenRA.Mods.Common.Widgets
if (owner != null) if (owner != null)
{ {
font.DrawTextWithContrast(owner, chatpos, if (UseContrast)
line.Color, BackgroundColorDark, BackgroundColorLight, UseContrast ? 1 : 0); font.DrawTextWithContrast(owner, chatpos,
line.Color, BackgroundColorDark, BackgroundColorLight, 1);
else if (UseShadow)
font.DrawTextWithShadow(owner, chatpos,
line.Color, BackgroundColorDark, BackgroundColorLight, 1);
else
font.DrawText(owner, chatpos, line.Color);
} }
font.DrawTextWithContrast(text, chatpos + new int2(inset, 0), if (UseContrast)
Color.White, Color.Black, UseContrast ? 1 : 0); font.DrawTextWithContrast(text, chatpos + new int2(inset, 0),
Color.White, Color.Black, 1);
else if (UseShadow)
font.DrawTextWithShadow(text, chatpos + new int2(inset, 0),
Color.White, Color.Black, 1);
else
font.DrawText(text, chatpos + new int2(inset, 0), Color.White);
} }
Game.Renderer.DisableScissor(); Game.Renderer.DisableScissor();

2
OpenRA.Mods.Common/Widgets/SupportPowerTimerWidget.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.Common.Widgets
foreach (var t in texts) foreach (var t in texts)
{ {
var font = Game.Renderer.Fonts[Font]; var font = Game.Renderer.Fonts[Font];
font.DrawTextWithContrast(t.First, new float2(Bounds.Location) + new float2(0, y), t.Second, bgDark, bgLight, 1); font.DrawTextWithShadow(t.First, new float2(Bounds.Location) + new float2(0, y), t.Second, bgDark, bgLight, 1);
y += (font.Measure(t.First).Y + 5) * (int)Order; y += (font.Measure(t.First).Y + 5) * (int)Order;
} }
} }

2
mods/cnc/chrome/ingame-chat.yaml
View File

@@ -14,7 +14,7 @@ Container@CHAT_PANEL:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
RemoveTime: 250 RemoveTime: 250
UseContrast: yes UseShadow: True
Container@CHAT_CHROME: Container@CHAT_CHROME:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM

2
mods/ra/chrome/ingame-chat.yaml
View File

@@ -14,7 +14,7 @@ Container@CHAT_PANEL:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM
RemoveTime: 250 RemoveTime: 250
UseContrast: yes UseShadow: True
Container@CHAT_CHROME: Container@CHAT_CHROME:
Width: PARENT_RIGHT Width: PARENT_RIGHT
Height: PARENT_BOTTOM Height: PARENT_BOTTOM