epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixed red DropDown separator on black observer UI
This commit is contained in:
Pavel Penev
2015-08-06 12:10:24 +03:00
parent 02b2360909 798086cd9d
commit 55479435ef
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs
View File

@@ -18,6 +18,9 @@ namespace OpenRA.Mods.Common.Widgets
{ {
public class DropDownButtonWidget : ButtonWidget public class DropDownButtonWidget : ButtonWidget
{ {
public readonly string SeparatorCollection = "dropdown";
public readonly string SeparatorImage = "separator";
Widget panel; Widget panel;
MaskWidget fullscreenMask; MaskWidget fullscreenMask;
Widget panelRoot; 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)); 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)); WidgetUtils.DrawRGBA(separator, new float2(-3, 0) + new float2(rb.Right - rb.Height + 4, rb.Top + (rb.Height - separator.Bounds.Height) / 2));
} }

3
mods/ra/chrome.yaml
View File

@@ -965,4 +965,5 @@ mainmenu-border: dialog.png
corner-br: 728,467,40,40 corner-br: 728,467,40,40
dropdown: dialog.png dropdown: dialog.png
separator: 512,1,1,19 separator: 512,1,1,19
observer-separator: 768,256,1,19

1
mods/ra/chrome/ingame-observer.yaml
View File

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