From 09606e8ffdc8d4cad61f0c1365e5e8d6cb0341b5 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 22 Nov 2013 13:36:22 +0100 Subject: [PATCH] Moved duplicate float2 before if as suggested. --- OpenRA.Game/Widgets/CheckboxWidget.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenRA.Game/Widgets/CheckboxWidget.cs b/OpenRA.Game/Widgets/CheckboxWidget.cs index 523dc05f97..a8c1fd41e5 100644 --- a/OpenRA.Game/Widgets/CheckboxWidget.cs +++ b/OpenRA.Game/Widgets/CheckboxWidget.cs @@ -47,6 +47,7 @@ namespace OpenRA.Widgets var colordisabled = GetColorDisabled(); var contrast = GetContrastColor(); var rect = RenderBounds; + var textSize = font.Measure(Text); var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height)); var state = disabled ? "checkbox-disabled" : Depressed && HasPressedState ? "checkbox-pressed" : @@ -54,16 +55,13 @@ namespace OpenRA.Widgets "checkbox"; WidgetUtils.DrawPanel(state, check); - - var textSize = font.Measure(Text); + var position = new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2); if (Contrast) - font.DrawTextWithContrast(Text, - new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2), + font.DrawTextWithContrast(Text, position, disabled ? colordisabled : color, contrast, 2); else - font.DrawText(Text, - new float2(rect.Left + rect.Height * 1.5f, RenderOrigin.Y - BaseLine + (Bounds.Height - textSize.Y)/2), + font.DrawText(Text, position, disabled ? colordisabled : color); if (IsChecked() || (Depressed && HasPressedState && !disabled))