From 4c92280b7e6b705bf8742723306a39a903747437 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 22 Nov 2013 13:34:46 +0100 Subject: [PATCH] Moved duplicated int2 in ButtonWidget before if as suggested. --- OpenRA.Game/Widgets/ButtonWidget.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs index 6f87839c2d..9b3016be55 100644 --- a/OpenRA.Game/Widgets/ButtonWidget.cs +++ b/OpenRA.Game/Widgets/ButtonWidget.cs @@ -194,13 +194,14 @@ namespace OpenRA.Widgets var contrast = GetContrastColor(); var s = font.Measure(text); var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0); + var position = new int2(rb.X + (UsableWidth - s.X) / 2, rb.Y + (Bounds.Height - s.Y) / 2); DrawBackground(rb, disabled, Depressed, Ui.MouseOverWidget == this, highlighted); if (Contrast) - font.DrawTextWithContrast(text, new int2(rb.X + (UsableWidth - s.X) / 2, rb.Y + (Bounds.Height - s.Y) / 2) + stateOffset, + font.DrawTextWithContrast(text, position + stateOffset, disabled ? colordisabled : color, contrast, 2); else - font.DrawText(text, new int2(rb.X + (UsableWidth - s.X)/ 2, rb.Y + (Bounds.Height - s.Y) / 2) + stateOffset, + font.DrawText(text, position + stateOffset, disabled ? colordisabled : color); }