Merge pull request #8963 from Mailaender/ra-observer-dropdown-separator

Fixed red DropDown separator on black observer UI
This commit is contained in:
Pavel Penev
2015-08-06 12:10:24 +03:00
3 changed files with 7 additions and 2 deletions

View File

@@ -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));
}

View File

@@ -966,3 +966,4 @@ mainmenu-border: dialog.png
dropdown: dialog.png
separator: 512,1,1,19
observer-separator: 768,256,1,19

View File

@@ -89,6 +89,7 @@ Container@OBSERVER_WIDGETS:
Font: Bold
VisualHeight: 0
Background: sidebar-button-observershroud
SeparatorImage: observer-separator
Children:
LogicKeyListener@SHROUD_KEYHANDLER:
Image@FLAG: