diff --git a/OpenRA.Game/Widgets/BackgroundWidget.cs b/OpenRA.Game/Widgets/BackgroundWidget.cs index 860fe52ff6..de336693ae 100644 --- a/OpenRA.Game/Widgets/BackgroundWidget.cs +++ b/OpenRA.Game/Widgets/BackgroundWidget.cs @@ -22,6 +22,7 @@ namespace OpenRA.Widgets { class BackgroundWidget : Widget { + public readonly string Background = "dialog"; public override void Draw(World world) { if (!Visible) @@ -30,7 +31,7 @@ namespace OpenRA.Widgets return; } - WidgetUtils.DrawPanel("dialog", Bounds, null); + WidgetUtils.DrawPanel(Background, Bounds, null); base.Draw(world); } } diff --git a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs b/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs index b7f71a06bb..17db2d7b98 100644 --- a/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs +++ b/OpenRA.Game/Widgets/SpecialPowerBinWidget.cs @@ -158,7 +158,7 @@ namespace OpenRA.Widgets void DrawSupportPowerTooltip(World world, SupportPower sp, int2 pos) { var tooltipBounds = new Rectangle(pos.X,pos.Y,400,100); - WidgetUtils.DrawPanel("dialog", tooltipBounds, null); + WidgetUtils.DrawPanel("dialog4", tooltipBounds, null); pos += new int2(5, 5); Game.chrome.renderer.BoldFont.DrawText(Game.chrome.rgbaRenderer, sp.Info.Description, pos, Color.White); diff --git a/OpenRA.Game/Widgets/WidgetUtils.cs b/OpenRA.Game/Widgets/WidgetUtils.cs index 0e68c01fa5..8b4ef6ff57 100644 --- a/OpenRA.Game/Widgets/WidgetUtils.cs +++ b/OpenRA.Game/Widgets/WidgetUtils.cs @@ -48,14 +48,18 @@ namespace OpenRA.Widgets var r = Game.chrome.renderer; var sr = Game.chrome.rgbaRenderer; - r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height); var images = new[] { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" }; var ss = images.Select(i => ChromeProvider.GetImage(Game.chrome.renderer, collection, i)).ToArray(); - + + // Don't draw the background below the bottom/right borders + r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width - (int)ss[3].size.X, Bounds.Height - (int)ss[1].size.Y); for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[8].size.X) for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[8].size.Y) sr.DrawSprite(ss[8], new float2(x, y), "chrome"); + + sr.Flush(); // because the scissor is changing + r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height - (int)ss[1].size.Y); //draw borders for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[2].size.Y) @@ -64,12 +68,18 @@ namespace OpenRA.Widgets sr.DrawSprite(ss[3], new float2(Bounds.Right - ss[3].size.X, y), "chrome"); } + sr.Flush(); // because the scissor is changing + r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width - (int)ss[3].size.X, Bounds.Height); + for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[0].size.X) { sr.DrawSprite(ss[0], new float2(x, Bounds.Top), "chrome"); sr.DrawSprite(ss[1], new float2(x, Bounds.Bottom - ss[1].size.Y), "chrome"); } + sr.Flush(); // because the scissor is changing + r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height); + sr.DrawSprite(ss[4], new float2(Bounds.Left, Bounds.Top), "chrome"); sr.DrawSprite(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top), "chrome"); sr.DrawSprite(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y), "chrome"); diff --git a/artsrc/ra/dialog4.svg b/artsrc/ra/dialog4.svg new file mode 100644 index 0000000000..334b740f48 --- /dev/null +++ b/artsrc/ra/dialog4.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/mods/ra/chrome.xml b/mods/ra/chrome.xml index a95824efe1..ea513a6044 100644 --- a/mods/ra/chrome.xml +++ b/mods/ra/chrome.xml @@ -143,6 +143,17 @@ + + + + + + + + + + + diff --git a/mods/ra/dialog4.png b/mods/ra/dialog4.png new file mode 100644 index 0000000000..6a9d3f4e27 Binary files /dev/null and b/mods/ra/dialog4.png differ