From 987fdab04217737c76fc9ea323c798505572127e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 5 Aug 2015 21:19:09 +0200 Subject: [PATCH 1/2] unhardcode the chrome definition keys --- OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs b/OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs index 49f538a69e..1cd3dd7ddc 100644 --- a/OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs +++ b/OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs @@ -18,6 +18,9 @@ namespace OpenRA.Mods.Common.Widgets { public class DropDownButtonWidget : ButtonWidget { + public readonly string SeparatorCollection = "dropdown"; + public readonly string SeparatorImage = "separator"; + Widget panel; MaskWidget fullscreenMask; Widget panelRoot; @@ -44,7 +47,7 @@ namespace OpenRA.Mods.Common.Widgets WidgetUtils.DrawRGBA(image, stateOffset + new float2(rb.Right - rb.Height + 4, rb.Top + (rb.Height - image.Bounds.Height) / 2)); - var separator = ChromeProvider.GetImage("dropdown", "separator"); + var separator = ChromeProvider.GetImage(SeparatorCollection, SeparatorImage); WidgetUtils.DrawRGBA(separator, new float2(-3, 0) + new float2(rb.Right - rb.Height + 4, rb.Top + (rb.Height - separator.Bounds.Height) / 2)); } From 798086cd9d195645a8f5f1f20f62311187fc5bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 5 Aug 2015 21:19:34 +0200 Subject: [PATCH 2/2] fix the red separator being used on black observer UI parts --- mods/ra/chrome.yaml | 3 ++- mods/ra/chrome/ingame-observer.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mods/ra/chrome.yaml b/mods/ra/chrome.yaml index 148f250925..9dfc3662cf 100644 --- a/mods/ra/chrome.yaml +++ b/mods/ra/chrome.yaml @@ -965,4 +965,5 @@ mainmenu-border: dialog.png corner-br: 728,467,40,40 dropdown: dialog.png - separator: 512,1,1,19 \ No newline at end of file + separator: 512,1,1,19 + observer-separator: 768,256,1,19 \ No newline at end of file diff --git a/mods/ra/chrome/ingame-observer.yaml b/mods/ra/chrome/ingame-observer.yaml index 692b201e01..394c113fab 100644 --- a/mods/ra/chrome/ingame-observer.yaml +++ b/mods/ra/chrome/ingame-observer.yaml @@ -89,6 +89,7 @@ Container@OBSERVER_WIDGETS: Font: Bold VisualHeight: 0 Background: sidebar-button-observershroud + SeparatorImage: observer-separator Children: LogicKeyListener@SHROUD_KEYHANDLER: Image@FLAG: