diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs index 3936cd0a06..fbcafce3a5 100755 --- a/OpenRA.Game/Graphics/Viewport.cs +++ b/OpenRA.Game/Graphics/Viewport.cs @@ -127,7 +127,7 @@ namespace OpenRA.Graphics using( new PerfSample("render_widgets") ) { Ui.Draw(); - var cursorName = Ui.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default"; + var cursorName = Ui.Root.GetCursorOuter(Viewport.LastMousePos) ?? "default"; var cursorSequence = CursorProvider.GetCursorSequence(cursorName); var cursorSprite = cursorSequence.GetSprite((int)cursorFrame); diff --git a/OpenRA.Game/Widgets/DropDownButtonWidget.cs b/OpenRA.Game/Widgets/DropDownButtonWidget.cs index 6c70da85bc..7b82a09440 100644 --- a/OpenRA.Game/Widgets/DropDownButtonWidget.cs +++ b/OpenRA.Game/Widgets/DropDownButtonWidget.cs @@ -57,8 +57,8 @@ namespace OpenRA.Widgets if (panel == null) return; - Ui.RootWidget.RemoveChild(fullscreenMask); - Ui.RootWidget.RemoveChild(panel); + Ui.Root.RemoveChild(fullscreenMask); + Ui.Root.RemoveChild(panel); panel = fullscreenMask = null; } @@ -72,11 +72,11 @@ namespace OpenRA.Widgets fullscreenMask = new MaskWidget(); fullscreenMask.Bounds = new Rectangle(0, 0, Game.viewport.Width, Game.viewport.Height); fullscreenMask.OnMouseDown = mi => RemovePanel(); - Ui.RootWidget.AddChild(fullscreenMask); + Ui.Root.AddChild(fullscreenMask); var oldBounds = panel.Bounds; panel.Bounds = new Rectangle(RenderOrigin.X, RenderOrigin.Y + Bounds.Height, oldBounds.Width, oldBounds.Height); - Ui.RootWidget.AddChild(panel); + Ui.Root.AddChild(panel); } public void ShowDropDown(string panelTemplate, int height, IEnumerable options, Func setupItem) diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index 01b2ce06a2..dfb5bfebcf 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -19,18 +19,19 @@ namespace OpenRA.Widgets { public static class Ui { - public static Widget RootWidget = new ContainerWidget(); + public static Widget Root = new ContainerWidget(); static Stack WindowList = new Stack(); + public static Widget SelectedWidget; public static Widget MouseOverWidget; public static void CloseWindow() { if (WindowList.Count > 0) - RootWidget.RemoveChild(WindowList.Pop()); + Root.RemoveChild(WindowList.Pop()); if (WindowList.Count > 0) - RootWidget.AddChild(WindowList.Peek()); + Root.AddChild(WindowList.Peek()); } public static Widget OpenWindow(string id) @@ -40,9 +41,9 @@ namespace OpenRA.Widgets public static Widget OpenWindow(string id, WidgetArgs args) { - var window = Game.modData.WidgetLoader.LoadWidget(args, RootWidget, id); + var window = Game.modData.WidgetLoader.LoadWidget(args, Root, id); if (WindowList.Count > 0) - RootWidget.RemoveChild(WindowList.Peek()); + Root.RemoveChild(WindowList.Peek()); WindowList.Push(window); return window; } @@ -52,9 +53,9 @@ namespace OpenRA.Widgets return Game.modData.WidgetLoader.LoadWidget(args, parent, id); } - public static void Tick() { RootWidget.TickOuter(); } + public static void Tick() { Root.TickOuter(); } - public static void Draw() { RootWidget.DrawOuter(); } + public static void Draw() { Root.DrawOuter(); } public static bool HandleInput(MouseInput mi) { @@ -67,7 +68,7 @@ namespace OpenRA.Widgets if (SelectedWidget != null && SelectedWidget.HandleMouseInputOuter(mi)) handled = true; - if (!handled && RootWidget.HandleMouseInputOuter(mi)) + if (!handled && Root.HandleMouseInputOuter(mi)) handled = true; if (mi.Event == MouseInputEvent.Move) @@ -93,14 +94,14 @@ namespace OpenRA.Widgets if (SelectedWidget != null) return SelectedWidget.HandleKeyPressOuter(e); - if (RootWidget.HandleKeyPressOuter(e)) + if (Root.HandleKeyPressOuter(e)) return true; return false; } public static void ResetAll() { - RootWidget.RemoveChildren(); + Root.RemoveChildren(); while (WindowList.Count > 0) CloseWindow(); diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs index 6056f1e01c..cd63e87f74 100644 --- a/OpenRA.Mods.Cnc/CncLoadScreen.cs +++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs @@ -131,7 +131,7 @@ namespace OpenRA.Mods.Cnc { "continueLoading", () => TestAndContinue() }, { "installData", Info } }; - Ui.LoadWidget(Info["InstallerBackgroundWidget"], Ui.RootWidget, args); + Ui.LoadWidget(Info["InstallerBackgroundWidget"], Ui.Root, args); Ui.OpenWindow(Info["InstallerMenuWidget"], args); } else diff --git a/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs index 7b7829fc67..ce4e19e7d7 100644 --- a/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs +++ b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.Cnc.Widgets this.world = world; tabsWidget = Lazy.New(() => - Ui.RootWidget.GetWidget(info.ProductionTabsWidget)); + Ui.Root.GetWidget(info.ProductionTabsWidget)); } public void SelectionChanged() diff --git a/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs b/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs index f2d532f518..0e973ad95c 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Cnc.Widgets : base(world, worldRenderer) { tooltipContainer = Lazy.New(() => - Ui.RootWidget.GetWidget(TooltipContainer)); + Ui.Root.GetWidget(TooltipContainer)); } public override void MouseEntered() diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs index 076c433d5f..919dad7f71 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs @@ -91,7 +91,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic } ingameRoot.IsVisible = () => false; - Game.LoadWidget(world, "INGAME_MENU", Ui.RootWidget, new WidgetArgs() + Game.LoadWidget(world, "INGAME_MENU", Ui.Root, new WidgetArgs() { { "onExit", () => ingameRoot.IsVisible = () => true } }); diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs index 9ec8729c0d..00657139f6 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs @@ -81,7 +81,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic resumeButton.OnClick = () => { Ui.CloseWindow(); - Ui.RootWidget.RemoveChild(menu); + Ui.Root.RemoveChild(menu); world.WorldActor.Trait().Fade(CncMenuPaletteEffect.EffectType.None); onExit(); }; diff --git a/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs b/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs index cc3b1b2803..97da7eed72 100755 --- a/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs @@ -32,7 +32,7 @@ namespace OpenRA.Mods.Cnc.Widgets { pm = world.LocalPlayer.PlayerActor.Trait(); tooltipContainer = Lazy.New(() => - Ui.RootWidget.GetWidget(TooltipContainer)); + Ui.Root.GetWidget(TooltipContainer)); } public override void MouseEntered() diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs index bf9de631f4..3952998cfd 100755 --- a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs @@ -63,7 +63,7 @@ namespace OpenRA.Mods.Cnc.Widgets this.world = world; this.worldRenderer = worldRenderer; tooltipContainer = Lazy.New(() => - Ui.RootWidget.GetWidget(TooltipContainer)); + Ui.Root.GetWidget(TooltipContainer)); cantBuild = new Animation("clock"); cantBuild.PlayFetchIndex("idle", () => 0); diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs index 59832f6ea0..a2c5ae5f3c 100755 --- a/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs @@ -86,7 +86,7 @@ namespace OpenRA.Mods.Cnc.Widgets // Only visible if the production palette has icons to display IsVisible = () => queueGroup != null && Groups[queueGroup].Tabs.Count > 0; - paletteWidget = Lazy.New(() => Ui.RootWidget.GetWidget(PaletteWidget)); + paletteWidget = Lazy.New(() => Ui.Root.GetWidget(PaletteWidget)); } public void SelectNextTab(bool reverse) diff --git a/OpenRA.Mods.Cnc/Widgets/SiloBarWidget.cs b/OpenRA.Mods.Cnc/Widgets/SiloBarWidget.cs index e3460c2d21..0c3b8b5e2d 100755 --- a/OpenRA.Mods.Cnc/Widgets/SiloBarWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/SiloBarWidget.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Widgets { pr = world.LocalPlayer.PlayerActor.Trait(); tooltipContainer = Lazy.New(() => - Ui.RootWidget.GetWidget(TooltipContainer)); + Ui.Root.GetWidget(TooltipContainer)); } public override void MouseEntered() diff --git a/OpenRA.Mods.Cnc/Widgets/SupportPowersWidget.cs b/OpenRA.Mods.Cnc/Widgets/SupportPowersWidget.cs index 1c7907102d..8ffad9858d 100755 --- a/OpenRA.Mods.Cnc/Widgets/SupportPowersWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/SupportPowersWidget.cs @@ -45,7 +45,7 @@ namespace OpenRA.Mods.Cnc.Widgets this.worldRenderer = worldRenderer; spm = world.LocalPlayer.PlayerActor.Trait(); tooltipContainer = Lazy.New(() => - Ui.RootWidget.GetWidget(TooltipContainer)); + Ui.Root.GetWidget(TooltipContainer)); iconSprites = Rules.Info.Values.SelectMany( u => u.Traits.WithInterface() ) .Select(u => u.Image).Distinct() diff --git a/OpenRA.Mods.Cnc/Widgets/ToggleButtonWidget.cs b/OpenRA.Mods.Cnc/Widgets/ToggleButtonWidget.cs index b025abad93..32ab01cd8b 100644 --- a/OpenRA.Mods.Cnc/Widgets/ToggleButtonWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/ToggleButtonWidget.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.Cnc.Widgets : base() { tooltipContainer = Lazy.New(() => - Ui.RootWidget.GetWidget(TooltipContainer)); + Ui.Root.GetWidget(TooltipContainer)); } protected ToggleButtonWidget(ToggleButtonWidget other) @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Cnc.Widgets TooltipText = other.TooltipText; TooltipContainer = other.TooltipContainer; tooltipContainer = Lazy.New(() => - Ui.RootWidget.GetWidget(TooltipContainer)); + Ui.Root.GetWidget(TooltipContainer)); } public override void MouseEntered() diff --git a/OpenRA.Mods.RA/NullLoadScreen.cs b/OpenRA.Mods.RA/NullLoadScreen.cs index d17757d064..27b0aa5e03 100644 --- a/OpenRA.Mods.RA/NullLoadScreen.cs +++ b/OpenRA.Mods.RA/NullLoadScreen.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA public void StartGame() { Ui.ResetAll(); - Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Ui.RootWidget, "INIT_SETUP" ); + Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Ui.Root, "INIT_SETUP" ); } } } diff --git a/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs b/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs index 695266d33d..d5fc347109 100644 --- a/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs +++ b/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs @@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA public class LoadWidgetAtGameStartInfo : ITraitInfo { public readonly string Widget = null; - public readonly bool ClearRootWidget = true; + public readonly bool ClearRoot = true; public object Create(ActorInitializer init) { return new LoadWidgetAtGameStart(this); } } @@ -62,10 +62,10 @@ namespace OpenRA.Mods.RA public void WorldLoaded(World world) { // Clear any existing widget state - if (Info.ClearRootWidget) + if (Info.ClearRoot) Ui.ResetAll(); - Game.LoadWidget(world, Info.Widget, Ui.RootWidget, new WidgetArgs()); + Game.LoadWidget(world, Info.Widget, Ui.Root, new WidgetArgs()); } } } \ No newline at end of file diff --git a/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs index 9f3ced4abf..74e9183e3e 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs @@ -20,8 +20,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic [ObjectCreator.UseCtor] public DeveloperModeLogic(World world) { - var devmodeBG = Ui.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); - var devModeButton = Ui.RootWidget.GetWidget("INGAME_DEVELOPERMODE_BUTTON"); + var devmodeBG = Ui.Root.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); + var devModeButton = Ui.Root.GetWidget("INGAME_DEVELOPERMODE_BUTTON"); devModeButton.OnClick = () => devmodeBG.Visible ^= true; var devTrait = world.LocalPlayer.PlayerActor.Trait(); diff --git a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs index 8bbce88d17..f4a838cda8 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic public DiplomacyLogic(World world) { this.world = world; - var root = Ui.RootWidget.GetWidget("INGAME_ROOT"); + var root = Ui.Root.GetWidget("INGAME_ROOT"); var diplomacyBG = root.GetWidget("DIPLOMACY_BG"); var diplomacy = root.GetWidget("INGAME_DIPLOMACY_BUTTON"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs index 8245f84a64..9de9312164 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs @@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.AddChatLine += AddChatLine; Game.BeforeGameStart += UnregisterEvents; - var r = Ui.RootWidget; + var r = Ui.Root; gameRoot = r.GetWidget("INGAME_ROOT"); var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs index f9aba168ef..941e31a787 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.AddChatLine += AddChatLine; Game.BeforeGameStart += UnregisterEvents; - var r = Ui.RootWidget; + var r = Ui.Root; gameRoot = r.GetWidget("OBSERVER_ROOT"); var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index be6c8bc118..0be93fbbe2 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -247,7 +247,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic MapUid = orderManager.LobbyInfo.GlobalSettings.Map; Map = new Map(Game.modData.AvailableMaps[MapUid].Path); - var title = Ui.RootWidget.GetWidget("TITLE"); + var title = Ui.Root.GetWidget("TITLE"); title.Text = orderManager.LobbyInfo.GlobalSettings.ServerName; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs index 61ab61269a..d18f639395 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs @@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { rootMenu = widget; - Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Ui.RootWidget, "PERF_BG" ); + Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Ui.Root, "PERF_BG" ); widget.GetWidget("MAINMENU_BUTTON_JOIN").OnClick = () => OpenGamePanel("JOINSERVER_BG"); widget.GetWidget("MAINMENU_BUTTON_CREATE").OnClick = () => OpenGamePanel("CREATESERVER_BG"); widget.GetWidget("MAINMENU_BUTTON_DIRECTCONNECT").OnClick = () => OpenGamePanel("DIRECTCONNECT_BG"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs index 695c767a47..01fd29d830 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic public MusicPlayerLogic() { - bg = Ui.RootWidget.GetWidget("MUSIC_MENU"); + bg = Ui.Root.GetWidget("MUSIC_MENU"); CurrentSong = GetNextSong(); bg.GetWidget( "BUTTON_PAUSE" ).IsVisible = () => Sound.MusicPlaying; diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs index ae8ee3e186..702cdf64e2 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic public OrderButtonsChromeLogic(World world) { /* todo: attach this to the correct widget, to remove the lookups below */ - var r = Ui.RootWidget; + var r = Ui.Root; var gameRoot = r.GetWidget("INGAME_ROOT"); var moneybin = gameRoot.GetWidget("INGAME_MONEY_BIN"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs index 4fe7f6f3a5..e1192696dc 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs @@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { public PerfDebugLogic() { - var r = Ui.RootWidget; + var r = Ui.Root; var perfRoot = r.GetWidget("PERF_BG"); perfRoot.IsVisible = () => perfRoot.Visible && Game.Settings.Debug.PerfGraph; diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs index 0616410554..3e6c20cd04 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic public SettingsMenuLogic() { - bg = Ui.RootWidget.GetWidget("SETTINGS_MENU"); + bg = Ui.Root.GetWidget("SETTINGS_MENU"); var tabs = bg.GetWidget("TAB_CONTAINER"); //Tabs diff --git a/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs index a2c2332bab..dcff22e2f6 100755 --- a/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs @@ -53,7 +53,7 @@ namespace OpenRA.Mods.RA.Widgets if( world.LocalPlayer == null ) return; if( world.LocalPlayer.WinState != WinState.Undefined ) return; - var radarBin = Ui.RootWidget.GetWidget(RadarBin); + var radarBin = Ui.Root.GetWidget(RadarBin); powerCollection = "power-" + world.LocalPlayer.Country.Race; diff --git a/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs index ffd72fe792..bc780fa532 100755 --- a/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs +++ b/OpenRA.Mods.RA/Widgets/RadarBinWidget.cs @@ -113,7 +113,7 @@ namespace OpenRA.Mods.RA.Widgets if (WorldInteractionController != null) { - var controller = Ui.RootWidget.GetWidget(WorldInteractionController); + var controller = Ui.Root.GetWidget(WorldInteractionController); controller.HandleMouseInput(fakemi); fakemi.Event = MouseInputEvent.Up; controller.HandleMouseInput(fakemi); diff --git a/OpenRA.Mods.RA/Widgets/RadarWidget.cs b/OpenRA.Mods.RA/Widgets/RadarWidget.cs index f1079119a3..c4698d94cc 100755 --- a/OpenRA.Mods.RA/Widgets/RadarWidget.cs +++ b/OpenRA.Mods.RA/Widgets/RadarWidget.cs @@ -110,7 +110,7 @@ namespace OpenRA.Mods.RA.Widgets if (WorldInteractionController != null) { - var controller = Ui.RootWidget.GetWidget(WorldInteractionController); + var controller = Ui.Root.GetWidget(WorldInteractionController); controller.HandleMouseInput(fakemi); fakemi.Event = MouseInputEvent.Up; controller.HandleMouseInput(fakemi); diff --git a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs index 10839e1f4e..36bbaf5cdd 100644 --- a/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs +++ b/OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA public void SelectionChanged() { - var palette = Ui.RootWidget.GetWidget("INGAME_BUILD_PALETTE"); + var palette = Ui.Root.GetWidget("INGAME_BUILD_PALETTE"); if (palette == null) return;