diff --git a/OpenRA.Game/Widgets/CheckboxWidget.cs b/OpenRA.Game/Widgets/CheckboxWidget.cs index 64f204f06d..ad3fc30a89 100644 --- a/OpenRA.Game/Widgets/CheckboxWidget.cs +++ b/OpenRA.Game/Widgets/CheckboxWidget.cs @@ -46,6 +46,8 @@ namespace OpenRA.Widgets if (Checked()) { + Game.chrome.renderer.RgbaSpriteRenderer.Flush(); + Game.chrome.lineRenderer.FillRect( new RectangleF( Game.viewport.Location.X + Bounds.Left + 4, @@ -56,8 +58,6 @@ namespace OpenRA.Widgets Game.chrome.lineRenderer.Flush(); } - Game.chrome.renderer.RgbaSpriteRenderer.Flush(); - base.Draw(world); } } diff --git a/OpenRA.Game/Widgets/LabelWidget.cs b/OpenRA.Game/Widgets/LabelWidget.cs index 1e8236e99f..c1b1ece9ef 100644 --- a/OpenRA.Game/Widgets/LabelWidget.cs +++ b/OpenRA.Game/Widgets/LabelWidget.cs @@ -46,8 +46,6 @@ namespace OpenRA.Widgets var font = (Bold) ? Game.chrome.renderer.BoldFont : Game.chrome.renderer.RegularFont; var text = GetText(); - Rectangle r = Bounds; - Game.chrome.renderer.Device.EnableScissor(r.Left,r.Top,r.Width,r.Height); int2 textSize = font.Measure(text); int2 position = new int2(Bounds.X,Bounds.Y); @@ -56,8 +54,6 @@ namespace OpenRA.Widgets - new int2(textSize.X / 2, textSize.Y/2); font.DrawText(text, position, Color.White); - Game.chrome.renderer.RgbaSpriteRenderer.Flush(); - Game.chrome.renderer.Device.DisableScissor(); base.Draw(world); } } diff --git a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs b/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs index a86df0af08..666f535468 100644 --- a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs +++ b/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs @@ -94,7 +94,6 @@ namespace OpenRA.Widgets for (var i = 1; i < numPowers; i++) WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-middle"), new float2(Bounds.X, Bounds.Y + i * 51)); WidgetUtils.DrawRGBA(WidgetUtils.GetChromeImage(world,"specialbin-bottom"), new float2(Bounds.X, Bounds.Y + numPowers * 51)); - Game.chrome.renderer.RgbaSpriteRenderer.Flush(); // Hack Hack Hack Bounds.Width = 69; @@ -137,10 +136,8 @@ namespace OpenRA.Widgets pos += new int2(0, 20); Game.chrome.renderer.RegularFont.DrawText(sp.Info.LongDesc.Replace("\\n", "\n"), pos, Color.White); } - - Game.chrome.renderer.RgbaSpriteRenderer.Flush(); } - + WidgetUtils.DrawSHP(image, drawPos); clock.PlayFetchIndex("idle", @@ -155,9 +152,9 @@ namespace OpenRA.Widgets ready.Play("ready"); WidgetUtils.DrawSHP(ready.Image, drawPos + new float2((64 - ready.Image.size.X) / 2, 2)); } - + buttons.Add(Pair.New(rect,HandleSupportPower(sp))); - + y += 51; } } diff --git a/OpenRA.Game/Widgets/WidgetUtils.cs b/OpenRA.Game/Widgets/WidgetUtils.cs index 441284fb2d..6d15672db5 100644 --- a/OpenRA.Game/Widgets/WidgetUtils.cs +++ b/OpenRA.Game/Widgets/WidgetUtils.cs @@ -191,7 +191,6 @@ namespace OpenRA.Widgets DrawRGBA(ss[7], new float2(br.X - (int)ss[7].size.X, br.Y - (int)ss[7].size.Y)); if (a != null) a(); - Game.chrome.renderer.RgbaSpriteRenderer.Flush(); } } }