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

Make CheckboxWidget honour GetText()

Browse Source
This commit is contained in:
Oliver Brakmann
2014-07-14 16:40:21 +02:00
parent cca6646927
commit 7546e8237e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,8 @@ namespace OpenRA.Widgets
var colordisabled = GetColorDisabled(); var colordisabled = GetColorDisabled();
var contrast = GetContrastColor(); var contrast = GetContrastColor();
var rect = RenderBounds; var rect = RenderBounds;
var textSize = font.Measure(Text); var text = GetText();
var textSize = font.Measure(text);
var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height)); var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height));
var state = disabled ? "checkbox-disabled" : var state = disabled ? "checkbox-disabled" :
highlighted ? "checkbox-highlighted" : highlighted ? "checkbox-highlighted" :
@@ -62,10 +63,10 @@ namespace OpenRA.Widgets
var position = new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2); var position = new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2);
if (Contrast) if (Contrast)
font.DrawTextWithContrast(Text, position, font.DrawTextWithContrast(text, position,
disabled ? colordisabled : color, contrast, 2); disabled ? colordisabled : color, contrast, 2);
else else
font.DrawText(Text, position, font.DrawText(text, position,
disabled ? colordisabled : color); disabled ? colordisabled : color);
if (IsChecked() || (Depressed && HasPressedState && !disabled)) if (IsChecked() || (Depressed && HasPressedState && !disabled))