diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs index 11b038022e..b1b086a136 100644 --- a/OpenRA.Game/Widgets/ButtonWidget.cs +++ b/OpenRA.Game/Widgets/ButtonWidget.cs @@ -157,7 +157,7 @@ namespace OpenRA.Widgets ww.OnMouseUp = mi => { var result = origMouseUp(mi); HideDropDown(); return result; }; ww.ClickThrough = false; ww.IsVisible = () => true; - ww.Bounds = new Rectangle(0, y, ww.Bounds.Width, ww.Bounds.Height); + ww.Bounds = new Rectangle(1, y, ww.Bounds.Width, ww.Bounds.Height); ww.OnMouseMove = mi => { diff --git a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs index 718a862fa5..8d1af3b77f 100755 --- a/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Delegates/LobbyDelegate.cs @@ -253,17 +253,28 @@ namespace OpenRA.Widgets.Delegates foreach (var c in CountryNames) { var cc = c; - dropDownOptions.Add(new Pair( cc.Value, + dropDownOptions.Add(new Pair( cc.Key, () => orderManager.IssueOrder( Order.Command("race "+cc.Key) )) ); }; DropDownButtonWidget.ShowDropDown( race, dropDownOptions, - (ac, w) => new LabelWidget - { - Bounds = new Rectangle(0, 0, w, 24), - Text = " {0}".F(ac.First), - OnMouseUp = mi => { ac.Second(); return true; }, + (ac, w) => + { + var ret = new LabelWidget + { + Bounds = new Rectangle(0, 0, w, 24), + Text = " {0}".F(CountryNames[ac.First]), + OnMouseUp = mi => { ac.Second(); return true; }, + }; + + ret.AddChild(new ImageWidget + { + Bounds = new Rectangle(5, 5, 40, 15), + GetImageName = () => ac.First, + GetImageCollection = () => "flags", + }); + return ret; }); }