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

Moved duplicate float2 before if as suggested.

Browse Source
This commit is contained in:
reaperrr
2013-11-22 13:36:22 +01:00
parent 4c92280b7e
commit 09606e8ffd
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,6 +47,7 @@ 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 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" :
Depressed && HasPressedState ? "checkbox-pressed" : Depressed && HasPressedState ? "checkbox-pressed" :
@@ -54,16 +55,13 @@ namespace OpenRA.Widgets
"checkbox"; "checkbox";
WidgetUtils.DrawPanel(state, check); WidgetUtils.DrawPanel(state, check);
var position = new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2);
var textSize = font.Measure(Text);
if (Contrast) if (Contrast)
font.DrawTextWithContrast(Text, font.DrawTextWithContrast(Text, position,
new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2),
disabled ? colordisabled : color, contrast, 2); disabled ? colordisabled : color, contrast, 2);
else else
font.DrawText(Text, font.DrawText(Text, position,
new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2),
disabled ? colordisabled : color); disabled ? colordisabled : color);
if (IsChecked() || (Depressed && HasPressedState && !disabled)) if (IsChecked() || (Depressed && HasPressedState && !disabled))