diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index 584ba8e0a1..2eb6b89dd5 100755 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -95,14 +95,14 @@ namespace OpenRA // Hacky workaround for orderManager visibility public static Widget OpenWindow(World world, string widget) { - return Widget.OpenWindow(widget, new WidgetArgs() {{ "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer }}); + return Ui.OpenWindow(widget, new WidgetArgs() {{ "world", world }, { "orderManager", orderManager }, { "worldRenderer", worldRenderer }}); } // Who came up with the great idea of making these things // impossible for the things that want them to access them directly? public static Widget OpenWindow(string widget, WidgetArgs args) { - return Widget.OpenWindow(widget, new WidgetArgs(args) + return Ui.OpenWindow(widget, new WidgetArgs(args) { { "world", worldRenderer.world }, { "orderManager", orderManager }, @@ -160,7 +160,7 @@ namespace OpenRA using( new PerfSample( "tick_time" ) ) { orderManager.LastTickTime += Settings.Game.Timestep; - Widget.DoTick(); + Ui.DoTick(); var world = orderManager.world; if (orderManager.GameStarted) ++Viewport.TicksSinceLastMove; @@ -215,7 +215,7 @@ namespace OpenRA worldRenderer = new WorldRenderer(orderManager.world); if (orderManager.GameStarted) return; - Widget.SelectedWidget = null; + Ui.SelectedWidget = null; orderManager.LocalFrameNumber = 0; orderManager.LastTickTime = Environment.TickCount; @@ -270,7 +270,7 @@ namespace OpenRA AddChatLine = (a,b,c) => {}; ConnectionStateChanged = om => {}; BeforeGameStart = () => {}; - Widget.ResetAll(); + Ui.ResetAll(); worldRenderer = null; if (server != null) diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs index 2f94ded976..db5529a316 100755 --- a/OpenRA.Game/Graphics/Viewport.cs +++ b/OpenRA.Game/Graphics/Viewport.cs @@ -126,15 +126,15 @@ namespace OpenRA.Graphics using( new PerfSample("render_widgets") ) { - Widget.DoDraw(); - var cursorName = Widget.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default"; + Ui.DoDraw(); + var cursorName = Ui.RootWidget.GetCursorOuter(Viewport.LastMousePos) ?? "default"; var cursorSequence = CursorProvider.GetCursorSequence(cursorName); var cursorSprite = cursorSequence.GetSprite((int)cursorFrame); renderer.SpriteRenderer.DrawSprite(cursorSprite, - Viewport.LastMousePos - cursorSequence.Hotspot, - Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette), - cursorSprite.size); + Viewport.LastMousePos - cursorSequence.Hotspot, + Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette), + cursorSprite.size); } using( new PerfSample("render_flip") ) @@ -194,7 +194,7 @@ namespace OpenRA.Graphics { if (cachedScroll != scrollPosition) { - int2 boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors + var boundary = new int2(1,1); // Add a curtain of cells around the viewport to account for rounding errors var tl = ViewToWorld(int2.Zero).ToInt2() - boundary; var br = ViewToWorld(new int2(Width, Height)).ToInt2() + boundary; diff --git a/OpenRA.Game/InputHandler.cs b/OpenRA.Game/InputHandler.cs index d7ba0ba64b..e7806d96c6 100755 --- a/OpenRA.Game/InputHandler.cs +++ b/OpenRA.Game/InputHandler.cs @@ -35,18 +35,12 @@ namespace OpenRA public void OnKeyInput( KeyInput input ) { - Sync.CheckSyncUnchanged( world, () => - { - Widget.DoHandleKeyPress( input ); - } ); + Sync.CheckSyncUnchanged(world, () => Ui.DoHandleKeyPress(input)); } public void OnMouseInput( MouseInput input ) { - Sync.CheckSyncUnchanged( world, () => - { - Widget.DoHandleInput( input ); - } ); + Sync.CheckSyncUnchanged(world, () => Ui.DoHandleInput(input)); } } } diff --git a/OpenRA.Game/Widgets/ButtonWidget.cs b/OpenRA.Game/Widgets/ButtonWidget.cs index 2012a19103..106eee97a1 100644 --- a/OpenRA.Game/Widgets/ButtonWidget.cs +++ b/OpenRA.Game/Widgets/ButtonWidget.cs @@ -128,7 +128,7 @@ namespace OpenRA.Widgets var s = font.Measure(text); var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0); - DrawBackground(rb, disabled, Depressed, Widget.MouseOverWidget == this); + DrawBackground(rb, disabled, Depressed, Ui.MouseOverWidget == this); font.DrawText(text, new int2(rb.X + (UsableWidth - s.X)/ 2, rb.Y + (Bounds.Height - s.Y) / 2) + stateOffset, disabled ? Color.Gray : Color.White); } diff --git a/OpenRA.Game/Widgets/CheckboxWidget.cs b/OpenRA.Game/Widgets/CheckboxWidget.cs index ec41719129..a896c70f62 100644 --- a/OpenRA.Game/Widgets/CheckboxWidget.cs +++ b/OpenRA.Game/Widgets/CheckboxWidget.cs @@ -49,7 +49,7 @@ namespace OpenRA.Widgets var check = new Rectangle(rect.Location, new Size(Bounds.Height, Bounds.Height)); var state = disabled ? "checkbox-disabled" : Depressed && HasPressedState ? "checkbox-pressed" : - Widget.MouseOverWidget == this ? "checkbox-hover" : + Ui.MouseOverWidget == this ? "checkbox-hover" : "checkbox"; WidgetUtils.DrawPanel(state, check); diff --git a/OpenRA.Game/Widgets/DropDownButtonWidget.cs b/OpenRA.Game/Widgets/DropDownButtonWidget.cs index 19509c7928..6c70da85bc 100644 --- a/OpenRA.Game/Widgets/DropDownButtonWidget.cs +++ b/OpenRA.Game/Widgets/DropDownButtonWidget.cs @@ -57,8 +57,8 @@ namespace OpenRA.Widgets if (panel == null) return; - Widget.RootWidget.RemoveChild(fullscreenMask); - Widget.RootWidget.RemoveChild(panel); + Ui.RootWidget.RemoveChild(fullscreenMask); + Ui.RootWidget.RemoveChild(panel); panel = fullscreenMask = null; } @@ -72,17 +72,17 @@ namespace OpenRA.Widgets fullscreenMask = new MaskWidget(); fullscreenMask.Bounds = new Rectangle(0, 0, Game.viewport.Width, Game.viewport.Height); fullscreenMask.OnMouseDown = mi => RemovePanel(); - Widget.RootWidget.AddChild(fullscreenMask); + Ui.RootWidget.AddChild(fullscreenMask); var oldBounds = panel.Bounds; panel.Bounds = new Rectangle(RenderOrigin.X, RenderOrigin.Y + Bounds.Height, oldBounds.Width, oldBounds.Height); - Widget.RootWidget.AddChild(panel); + Ui.RootWidget.AddChild(panel); } public void ShowDropDown(string panelTemplate, int height, IEnumerable options, Func setupItem) { var substitutions = new Dictionary() {{ "DROPDOWN_WIDTH", Bounds.Width }}; - var panel = (ScrollPanelWidget)Widget.LoadWidget(panelTemplate, null, new WidgetArgs() + var panel = (ScrollPanelWidget)Ui.LoadWidget(panelTemplate, null, new WidgetArgs() {{ "substitutions", substitutions }}); var itemTemplate = panel.GetWidget("TEMPLATE"); @@ -91,7 +91,7 @@ namespace OpenRA.Widgets { var o = option; - ScrollItemWidget item = setupItem(o, itemTemplate); + var item = setupItem(o, itemTemplate); var onClick = item.OnClick; item.OnClick = () => { onClick(); RemovePanel(); }; diff --git a/OpenRA.Game/Widgets/ScrollItemWidget.cs b/OpenRA.Game/Widgets/ScrollItemWidget.cs index 51a4d3dacf..17bcb77d0a 100644 --- a/OpenRA.Game/Widgets/ScrollItemWidget.cs +++ b/OpenRA.Game/Widgets/ScrollItemWidget.cs @@ -35,7 +35,7 @@ namespace OpenRA.Widgets public override void Draw() { var state = IsSelected() ? "scrollitem-selected" : - Widget.MouseOverWidget == this ? "scrollitem-hover" : + Ui.MouseOverWidget == this ? "scrollitem-hover" : null; if (state != null) diff --git a/OpenRA.Game/Widgets/ScrollPanelWidget.cs b/OpenRA.Game/Widgets/ScrollPanelWidget.cs index 21ab754831..c896775306 100644 --- a/OpenRA.Game/Widgets/ScrollPanelWidget.cs +++ b/OpenRA.Game/Widgets/ScrollPanelWidget.cs @@ -70,13 +70,13 @@ namespace OpenRA.Widgets scrollbarRect = new Rectangle(rb.Right - ScrollbarWidth, rb.Y + ScrollbarWidth - 1, ScrollbarWidth, ScrollbarHeight + 2); thumbRect = new Rectangle(rb.Right - ScrollbarWidth, thumbOrigin, ScrollbarWidth, thumbHeight); - var upHover = Widget.MouseOverWidget == this && upButtonRect.Contains(Viewport.LastMousePos); + var upHover = Ui.MouseOverWidget == this && upButtonRect.Contains(Viewport.LastMousePos); var upDisabled = thumbHeight == 0 || ListOffset >= 0; - var downHover = Widget.MouseOverWidget == this && downButtonRect.Contains(Viewport.LastMousePos); + var downHover = Ui.MouseOverWidget == this && downButtonRect.Contains(Viewport.LastMousePos); var downDisabled = thumbHeight == 0 || ListOffset <= Bounds.Height - ContentHeight; - var thumbHover = Widget.MouseOverWidget == this && thumbRect.Contains(Viewport.LastMousePos); + var thumbHover = Ui.MouseOverWidget == this && thumbRect.Contains(Viewport.LastMousePos); WidgetUtils.DrawPanel(Background, backgroundRect); WidgetUtils.DrawPanel("scrollpanel-bg", scrollbarRect); ButtonWidget.DrawBackground("button", upButtonRect, upDisabled, UpPressed, upHover); diff --git a/OpenRA.Game/Widgets/SliderWidget.cs b/OpenRA.Game/Widgets/SliderWidget.cs index d0ceab3817..e94a04f00a 100755 --- a/OpenRA.Game/Widgets/SliderWidget.cs +++ b/OpenRA.Game/Widgets/SliderWidget.cs @@ -117,7 +117,7 @@ namespace OpenRA.Widgets WidgetUtils.DrawPanel("slider-track", trackRect); // Thumb - var thumbHover = Widget.MouseOverWidget == this && tr.Contains(Viewport.LastMousePos); + var thumbHover = Ui.MouseOverWidget == this && tr.Contains(Viewport.LastMousePos); ButtonWidget.DrawBackground("scrollthumb", tr, IsDisabled(), isMoving, thumbHover); } } diff --git a/OpenRA.Game/Widgets/TextFieldWidget.cs b/OpenRA.Game/Widgets/TextFieldWidget.cs index 72e80057b6..497f57adf1 100644 --- a/OpenRA.Game/Widgets/TextFieldWidget.cs +++ b/OpenRA.Game/Widgets/TextFieldWidget.cs @@ -203,7 +203,7 @@ namespace OpenRA.Widgets var disabled = IsDisabled(); var state = disabled ? "textfield-disabled" : Focused ? "textfield-focused" : - Widget.MouseOverWidget == this ? "textfield-hover" : + Ui.MouseOverWidget == this ? "textfield-hover" : "textfield"; WidgetUtils.DrawPanel(state, diff --git a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs b/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs index fd77966a83..094119891e 100755 --- a/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs +++ b/OpenRA.Game/Widgets/ViewportScrollControllerWidget.cs @@ -57,7 +57,7 @@ namespace OpenRA.Widgets public static string GetScrollCursor(Widget w, ScrollDirection edge, int2 pos) { - if (!Game.Settings.Game.ViewportEdgeScroll || Widget.MouseOverWidget != w) + if (!Game.Settings.Game.ViewportEdgeScroll || Ui.MouseOverWidget != w) return null; var blockedDirections = Game.viewport.GetBlockedDirections(); @@ -81,10 +81,10 @@ namespace OpenRA.Widgets { switch (e.KeyName) { - case "up": Keyboard = Keyboard.Set(ScrollDirection.Up, (e.Event == KeyInputEvent.Down)); return true; - case "down": Keyboard = Keyboard.Set(ScrollDirection.Down, (e.Event == KeyInputEvent.Down)); return true; - case "left": Keyboard = Keyboard.Set(ScrollDirection.Left, (e.Event == KeyInputEvent.Down)); return true; - case "right": Keyboard = Keyboard.Set(ScrollDirection.Right, (e.Event == KeyInputEvent.Down)); return true; + case "up": Keyboard = Keyboard.Set(ScrollDirection.Up, e.Event == KeyInputEvent.Down); return true; + case "down": Keyboard = Keyboard.Set(ScrollDirection.Down, e.Event == KeyInputEvent.Down); return true; + case "left": Keyboard = Keyboard.Set(ScrollDirection.Left, e.Event == KeyInputEvent.Down); return true; + case "right": Keyboard = Keyboard.Set(ScrollDirection.Right, e.Event == KeyInputEvent.Down); return true; } return false; } @@ -109,7 +109,6 @@ namespace OpenRA.Widgets { var scroll = new float2(0, 0); - // Modified to use the ViewportEdgeScrollStep setting - Gecko if (Keyboard.Includes(ScrollDirection.Up) || Edge.Includes(ScrollDirection.Up)) scroll += new float2(0, -1); if (Keyboard.Includes(ScrollDirection.Right) || Edge.Includes(ScrollDirection.Right)) diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index 6dbfb67803..e413f7357d 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -17,7 +17,7 @@ using OpenRA.Graphics; namespace OpenRA.Widgets { - public abstract class Widget + public static class Ui { public static Widget RootWidget = new ContainerWidget(); @@ -108,10 +108,13 @@ namespace OpenRA.Widgets { RootWidget.RemoveChildren(); - while (Widget.WindowList.Count > 0) - Widget.CloseWindow(); + while (WindowList.Count > 0) + CloseWindow(); } + } + public abstract class Widget + { // Info defined in YAML public string Id = null; public string X = "0"; @@ -221,6 +224,7 @@ namespace OpenRA.Widgets } public virtual Rectangle EventBounds { get { return RenderBounds; } } + public virtual Rectangle GetEventBounds() { return Children @@ -229,16 +233,17 @@ namespace OpenRA.Widgets .Aggregate(EventBounds, Rectangle.Union); } - public bool Focused { get { return SelectedWidget == this; } } + public bool Focused { get { return Ui.SelectedWidget == this; } } + public virtual bool TakeFocus(MouseInput mi) { if (Focused) return true; - if (SelectedWidget != null && !SelectedWidget.LoseFocus(mi)) + if (Ui.SelectedWidget != null && !Ui.SelectedWidget.LoseFocus(mi)) return false; - SelectedWidget = this; + Ui.SelectedWidget = this; return true; } @@ -251,8 +256,8 @@ namespace OpenRA.Widgets public virtual bool LoseFocus() { - if (SelectedWidget == this) - SelectedWidget = null; + if (Ui.SelectedWidget == this) + Ui.SelectedWidget = null; return true; } @@ -285,17 +290,17 @@ namespace OpenRA.Widgets if (!(Focused || (IsVisible() && GetEventBounds().Contains(mi.Location)))) return false; - var oldMouseOver = MouseOverWidget; + var oldMouseOver = Ui.MouseOverWidget; // Send the event to the deepest children first and bubble up if unhandled foreach (var child in Children.OfType().Reverse()) if (child.HandleMouseInputOuter(mi)) return true; if (IgnoreChildMouseOver) - MouseOverWidget = oldMouseOver; + Ui.MouseOverWidget = oldMouseOver; - if (mi.Event == MouseInputEvent.Move && MouseOverWidget == null && !IgnoreMouseOver) - MouseOverWidget = this; + if (mi.Event == MouseInputEvent.Move && Ui.MouseOverWidget == null && !IgnoreMouseOver) + Ui.MouseOverWidget = this; return HandleMouseInput(mi); } diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs index fa18cfeffd..6056f1e01c 100644 --- a/OpenRA.Mods.Cnc/CncLoadScreen.cs +++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs @@ -123,7 +123,7 @@ namespace OpenRA.Mods.Cnc void TestAndContinue() { - Widget.ResetAll(); + Ui.ResetAll(); if (!FileSystem.Exists(Info["TestFile"])) { var args = new WidgetArgs() @@ -131,8 +131,8 @@ namespace OpenRA.Mods.Cnc { "continueLoading", () => TestAndContinue() }, { "installData", Info } }; - Widget.LoadWidget(Info["InstallerBackgroundWidget"], Widget.RootWidget, args); - Widget.OpenWindow(Info["InstallerMenuWidget"], args); + Ui.LoadWidget(Info["InstallerBackgroundWidget"], Ui.RootWidget, args); + Ui.OpenWindow(Info["InstallerMenuWidget"], args); } else Game.LoadShellMap(); diff --git a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs index 6dc66e9e52..6c17b8cc2f 100644 --- a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs +++ b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs @@ -52,7 +52,7 @@ namespace OpenRA.Mods.Cnc { Sound.StopMusic(); Game.Disconnect(); - Widget.ResetAll(); + Ui.ResetAll(); Game.LoadShellMap(); }; Game.RunAfterDelay(5000, () => Scripting.Media.PlayFMVFullscreen(w, "consyard.vqa", afterFMV)); @@ -68,7 +68,7 @@ namespace OpenRA.Mods.Cnc { Sound.StopMusic(); Game.Disconnect(); - Widget.ResetAll(); + Ui.ResetAll(); Game.LoadShellMap(); }; Game.RunAfterDelay(5000, () => Scripting.Media.PlayFMVFullscreen(w, "gameover.vqa", afterFMV)); diff --git a/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs index 58320c41ac..7b7829fc67 100644 --- a/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs +++ b/OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs @@ -33,15 +33,16 @@ namespace OpenRA.Mods.Cnc.Widgets this.world = world; tabsWidget = Lazy.New(() => - Widget.RootWidget.GetWidget(info.ProductionTabsWidget)); + Ui.RootWidget.GetWidget(info.ProductionTabsWidget)); } public void SelectionChanged() { // Find an actor with a queue var producer = world.Selection.Actors.FirstOrDefault(a => a.IsInWorld - && a.World.LocalPlayer == a.Owner - && a.HasTrait()); + && a.World.LocalPlayer == a.Owner + && a.HasTrait()); + if (producer != null) tabsWidget.Value.CurrentQueue = producer.TraitsImplementing().First(); } diff --git a/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs b/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs index f48391c5d0..dd3b2978be 100644 --- a/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs +++ b/OpenRA.Mods.Cnc/Widgets/CncWidgetUtils.cs @@ -19,19 +19,19 @@ namespace OpenRA.Mods.Cnc.Widgets { public static void PromptConfirmAction(string title, string text, Action onConfirm, Action onCancel) { - var prompt = Widget.OpenWindow("CONFIRM_PROMPT"); + var prompt = Ui.OpenWindow("CONFIRM_PROMPT"); prompt.GetWidget("PROMPT_TITLE").GetText = () => title; prompt.GetWidget("PROMPT_TEXT").GetText = () => text; prompt.GetWidget("CONFIRM_BUTTON").OnClick = () => { - Widget.CloseWindow(); + Ui.CloseWindow(); onConfirm(); }; prompt.GetWidget("CANCEL_BUTTON").OnClick = () => { - Widget.CloseWindow(); + Ui.CloseWindow(); onCancel(); }; } diff --git a/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs b/OpenRA.Mods.Cnc/Widgets/CncWorldInteractionControllerWidget.cs index c10c453614..f2d532f518 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(() => - Widget.RootWidget.GetWidget(TooltipContainer)); + Ui.RootWidget.GetWidget(TooltipContainer)); } public override void MouseEntered() @@ -121,7 +121,7 @@ namespace OpenRA.Mods.Cnc.Widgets public override void Tick() { Edge = ScrollDirection.None; - if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus && Widget.MouseOverWidget == this) + if (Game.Settings.Game.ViewportEdgeScroll && Game.HasInputFocus && Ui.MouseOverWidget == this) { // Check for edge-scroll if (Viewport.LastMousePos.X < EdgeScrollThreshold) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs index 1ace3f9c35..fcc16c8254 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncCheatsLogic.cs @@ -57,7 +57,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic panel.GetWidget("GIVE_EXPLORATION_BUTTON").OnClick = () => world.IssueOrder(new Order("DevGiveExploration", world.LocalPlayer.PlayerActor, false)); - panel.GetWidget("CLOSE_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("CLOSE_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; } public void Order(World world, string order) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs index 1fcbe0efa6..076c433d5f 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs @@ -86,12 +86,12 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic { if (menu != MenuType.None) { - Widget.CloseWindow(); + Ui.CloseWindow(); menu = MenuType.None; } ingameRoot.IsVisible = () => false; - Game.LoadWidget(world, "INGAME_MENU", Widget.RootWidget, new WidgetArgs() + Game.LoadWidget(world, "INGAME_MENU", Ui.RootWidget, new WidgetArgs() { { "onExit", () => ingameRoot.IsVisible = () => true } }); @@ -135,7 +135,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic cheatsButton.OnClick = () => { if (menu != MenuType.None) - Widget.CloseWindow(); + Ui.CloseWindow(); menu = MenuType.Cheats; Game.OpenWindow("CHEATS_PANEL", new WidgetArgs() {{"onExit", () => menu = MenuType.None }}); diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs index 0bbe512cde..9ec8729c0d 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs @@ -41,7 +41,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic Game.RunAfterDelay(1200 + 40 * mpe.Info.FadeLength, () => { Game.Disconnect(); - Widget.ResetAll(); + Ui.ResetAll(); Game.LoadShellMap(); }); }; @@ -60,7 +60,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic menu.GetWidget("MUSIC_BUTTON").OnClick = () => { hideButtons = true; - Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs() + Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs() { { "onExit", () => hideButtons = false }, }); @@ -69,7 +69,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic menu.GetWidget("SETTINGS_BUTTON").OnClick = () => { hideButtons = true; - Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs() + Ui.OpenWindow("SETTINGS_PANEL", new WidgetArgs() { { "world", world }, { "onExit", () => hideButtons = false }, @@ -80,8 +80,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic resumeButton.IsDisabled = () => resumeDisabled; resumeButton.OnClick = () => { - Widget.CloseWindow(); - Widget.RootWidget.RemoveChild(menu); + Ui.CloseWindow(); + Ui.RootWidget.RemoveChild(menu); world.WorldActor.Trait().Fade(CncMenuPaletteEffect.EffectType.None); onExit(); }; diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs index dfe8533ac9..76868856a2 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs @@ -40,7 +40,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic statusLabel = panel.GetWidget("STATUS_LABEL"); backButton = panel.GetWidget("BACK_BUTTON"); - backButton.OnClick = Widget.CloseWindow; + backButton.OnClick = Ui.CloseWindow; retryButton = panel.GetWidget("RETRY_BUTTON"); retryButton.OnClick = CheckForDisk; @@ -114,7 +114,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic Game.RunAfterTick(() => { - Widget.CloseWindow(); + Ui.CloseWindow(); afterInstall(); }); } diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallLogic.cs index 6e7096598f..91c1c32146 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallLogic.cs @@ -22,15 +22,15 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic var panel = widget.GetWidget("INSTALL_PANEL"); var args = new WidgetArgs() { - { "afterInstall", () => { Widget.CloseWindow(); continueLoading(); } }, + { "afterInstall", () => { Ui.CloseWindow(); continueLoading(); } }, { "installData", installData } }; panel.GetWidget("DOWNLOAD_BUTTON").OnClick = () => - Widget.OpenWindow("INSTALL_DOWNLOAD_PANEL", args); + Ui.OpenWindow("INSTALL_DOWNLOAD_PANEL", args); panel.GetWidget("INSTALL_BUTTON").OnClick = () => - Widget.OpenWindow("INSTALL_FROMCD_PANEL", new WidgetArgs(args) + Ui.OpenWindow("INSTALL_FROMCD_PANEL", new WidgetArgs(args) { { "filesToCopy", new[] { "CONQUER.MIX", "DESERT.MIX", "SCORES.MIX", "SOUNDS.MIX", "TEMPERAT.MIX", "WINTER.MIX" } }, @@ -41,11 +41,11 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic panel.GetWidget("MODS_BUTTON").OnClick = () => { - Widget.OpenWindow("MODS_PANEL", new WidgetArgs() + Ui.OpenWindow("MODS_PANEL", new WidgetArgs() { { "onExit", () => {} }, // Close this panel - { "onSwitch", Widget.CloseWindow }, + { "onSwitch", Ui.CloseWindow }, }); }; } diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs index 52ee13bf32..458b6276d8 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs @@ -40,7 +40,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic mainMenu.GetWidget("MODS_BUTTON").OnClick = () => { Menu = MenuType.None; - Widget.OpenWindow("MODS_PANEL", new WidgetArgs() + Ui.OpenWindow("MODS_PANEL", new WidgetArgs() { { "onExit", () => Menu = MenuType.Main }, { "onSwitch", RemoveShellmapUI } @@ -66,7 +66,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic settingsMenu.GetWidget("REPLAYS_BUTTON").OnClick = () => { Menu = MenuType.None; - Widget.OpenWindow("REPLAYBROWSER_PANEL", new WidgetArgs() + Ui.OpenWindow("REPLAYBROWSER_PANEL", new WidgetArgs() { { "onExit", () => Menu = MenuType.Settings }, { "onStart", RemoveShellmapUI } @@ -76,7 +76,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic settingsMenu.GetWidget("MUSIC_BUTTON").OnClick = () => { Menu = MenuType.None; - Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs() + Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs() { { "onExit", () => Menu = MenuType.Settings }, }); @@ -85,7 +85,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic settingsMenu.GetWidget("SETTINGS_BUTTON").OnClick = () => { Menu = MenuType.None; - Widget.OpenWindow("SETTINGS_PANEL", new WidgetArgs() + Ui.OpenWindow("SETTINGS_PANEL", new WidgetArgs() { { "world", world }, { "onExit", () => Menu = MenuType.Settings }, @@ -100,7 +100,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic void OpenGamePanel(string id) { Menu = MenuType.None; - Widget.OpenWindow(id, new WidgetArgs() + Ui.OpenWindow(id, new WidgetArgs() { { "onExit", () => Menu = MenuType.Multiplayer }, { "openLobby", () => OpenLobbyPanel(MenuType.Multiplayer, false) } diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs index 5c2ded3398..62f71c5ee6 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMusicPlayerLogic.cs @@ -42,7 +42,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic installed = Rules.Music.Where(m => m.Value.Exists).Any(); Func noMusic = () => !installed; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; Action afterInstall = () => { @@ -62,7 +62,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic var installButton = panel.GetWidget("INSTALL_BUTTON"); installButton.OnClick = () => - Widget.OpenWindow("INSTALL_MUSIC_PANEL", new WidgetArgs() { + Ui.OpenWindow("INSTALL_MUSIC_PANEL", new WidgetArgs() { { "afterInstall", afterInstall }, { "filesToCopy", new [] { "SCORES.MIX" } }, { "filesToExtract", new [] { "transit.mix" } }, diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs index c9b3e15124..d782aa9d46 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs @@ -140,7 +140,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic int.TryParse(windowHeight.Text, out y); graphicsSettings.WindowedSize = new int2(x,y); Game.Settings.Save(); - Widget.CloseWindow(); + Ui.CloseWindow(); onExit(); }; } diff --git a/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs b/OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs index 078e65d205..cc3b1b2803 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(() => - Widget.RootWidget.GetWidget(TooltipContainer)); + Ui.RootWidget.GetWidget(TooltipContainer)); } public override void MouseEntered() diff --git a/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs index 998fc2926a..bf9de631f4 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(() => - Widget.RootWidget.GetWidget(TooltipContainer)); + Ui.RootWidget.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 e6391e9ae6..59832f6ea0 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(() => Widget.RootWidget.GetWidget(PaletteWidget)); + paletteWidget = Lazy.New(() => Ui.RootWidget.GetWidget(PaletteWidget)); } public void SelectNextTab(bool reverse) @@ -135,9 +135,9 @@ namespace OpenRA.Mods.Cnc.Widgets rightButtonRect = new Rectangle(rb.Right - ArrowWidth, rb.Y, ArrowWidth, rb.Height); var leftDisabled = ListOffset >= 0; - var leftHover = Widget.MouseOverWidget == this && leftButtonRect.Contains(Viewport.LastMousePos); + var leftHover = Ui.MouseOverWidget == this && leftButtonRect.Contains(Viewport.LastMousePos); var rightDisabled = ListOffset <= Bounds.Width - rightButtonRect.Width - leftButtonRect.Width - ContentWidth; - var rightHover = Widget.MouseOverWidget == this && rightButtonRect.Contains(Viewport.LastMousePos); + var rightHover = Ui.MouseOverWidget == this && rightButtonRect.Contains(Viewport.LastMousePos); WidgetUtils.DrawPanel("panel-black", rb); ButtonWidget.DrawBackground("button", leftButtonRect, leftDisabled, leftPressed, leftHover); @@ -157,7 +157,7 @@ namespace OpenRA.Mods.Cnc.Widgets foreach (var tab in Groups[queueGroup].Tabs) { var rect = new Rectangle(origin.X + ContentWidth, origin.Y, TabWidth, rb.Height); - var hover = !leftHover && !rightHover && Widget.MouseOverWidget == this && rect.Contains(Viewport.LastMousePos); + var hover = !leftHover && !rightHover && Ui.MouseOverWidget == this && rect.Contains(Viewport.LastMousePos); var baseName = tab.Queue == CurrentQueue ? "button-toggled" : "button"; ButtonWidget.DrawBackground(baseName, rect, false, false, hover); ContentWidth += TabWidth - 1; diff --git a/OpenRA.Mods.Cnc/Widgets/SiloBarWidget.cs b/OpenRA.Mods.Cnc/Widgets/SiloBarWidget.cs index 153526bbb2..e3460c2d21 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(() => - Widget.RootWidget.GetWidget(TooltipContainer)); + Ui.RootWidget.GetWidget(TooltipContainer)); } public override void MouseEntered() diff --git a/OpenRA.Mods.Cnc/Widgets/SupportPowersWidget.cs b/OpenRA.Mods.Cnc/Widgets/SupportPowersWidget.cs index 5b65ff3de3..1c7907102d 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(() => - Widget.RootWidget.GetWidget(TooltipContainer)); + Ui.RootWidget.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 3870f93c85..b025abad93 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(() => - Widget.RootWidget.GetWidget(TooltipContainer)); + Ui.RootWidget.GetWidget(TooltipContainer)); } protected ToggleButtonWidget(ToggleButtonWidget other) @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Cnc.Widgets TooltipText = other.TooltipText; TooltipContainer = other.TooltipContainer; tooltipContainer = Lazy.New(() => - Widget.RootWidget.GetWidget(TooltipContainer)); + Ui.RootWidget.GetWidget(TooltipContainer)); } public override void MouseEntered() diff --git a/OpenRA.Mods.Cnc/Widgets/TooltipContainerWidget.cs b/OpenRA.Mods.Cnc/Widgets/TooltipContainerWidget.cs index 8b9b0038bc..68bec20e39 100755 --- a/OpenRA.Mods.Cnc/Widgets/TooltipContainerWidget.cs +++ b/OpenRA.Mods.Cnc/Widgets/TooltipContainerWidget.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.Cnc.Widgets public void SetTooltip(string id, WidgetArgs args) { RemoveTooltip(); - tooltip = Widget.LoadWidget(id, this, new WidgetArgs(args) {{ "tooltipContainer", this }}); + tooltip = Ui.LoadWidget(id, this, new WidgetArgs(args) {{ "tooltipContainer", this }}); } public void RemoveTooltip() @@ -45,7 +45,9 @@ namespace OpenRA.Mods.Cnc.Widgets } public override void Draw() { BeforeRender(); } + public override Rectangle GetEventBounds() { return Rectangle.Empty; } + public override int2 ChildOrigin { get @@ -62,6 +64,7 @@ namespace OpenRA.Mods.Cnc.Widgets } public override string GetCursor(int2 pos) { return null; } + public override Widget Clone() { throw new NotImplementedException(); } } } diff --git a/OpenRA.Mods.RA/NullLoadScreen.cs b/OpenRA.Mods.RA/NullLoadScreen.cs index b4ec3d5375..d17757d064 100644 --- a/OpenRA.Mods.RA/NullLoadScreen.cs +++ b/OpenRA.Mods.RA/NullLoadScreen.cs @@ -16,6 +16,7 @@ namespace OpenRA.Mods.RA public class NullLoadScreen : ILoadScreen { public void Init(Dictionary info) {} + public void Display() { if (Game.Renderer == null) @@ -28,8 +29,8 @@ namespace OpenRA.Mods.RA public void StartGame() { - Widget.ResetAll(); - Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Widget.RootWidget, "INIT_SETUP" ); + Ui.ResetAll(); + Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Ui.RootWidget, "INIT_SETUP" ); } } } diff --git a/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs b/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs index 67116d78a1..695266d33d 100644 --- a/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs +++ b/OpenRA.Mods.RA/OpenWidgetAtGameStart.cs @@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA public void WorldLoaded(World world) { // Remove all open widgets - Widget.ResetAll(); + Ui.ResetAll(); if (world.LocalPlayer != null) Game.OpenWindow(world, Info.Widget); @@ -63,9 +63,9 @@ namespace OpenRA.Mods.RA { // Clear any existing widget state if (Info.ClearRootWidget) - Widget.ResetAll(); + Ui.ResetAll(); - Game.LoadWidget(world, Info.Widget, Widget.RootWidget, new WidgetArgs()); + Game.LoadWidget(world, Info.Widget, Ui.RootWidget, new WidgetArgs()); } } } \ No newline at end of file diff --git a/OpenRA.Mods.RA/RALoadScreen.cs b/OpenRA.Mods.RA/RALoadScreen.cs index ce47436c98..ed0e0698c2 100644 --- a/OpenRA.Mods.RA/RALoadScreen.cs +++ b/OpenRA.Mods.RA/RALoadScreen.cs @@ -76,7 +76,7 @@ namespace OpenRA.Mods.RA void TestAndContinue() { - Widget.ResetAll(); + Ui.ResetAll(); if (!FileSystem.Exists(Info["TestFile"])) { var args = new WidgetArgs() @@ -84,13 +84,13 @@ namespace OpenRA.Mods.RA { "continueLoading", () => TestAndContinue() }, { "installData", Info } }; - Widget.OpenWindow(Info["InstallerMenuWidget"], args); + Ui.OpenWindow(Info["InstallerMenuWidget"], args); } else { Game.LoadShellMap(); - Widget.ResetAll(); - Widget.OpenWindow("MAINMENU_BG"); + Ui.ResetAll(); + Ui.OpenWindow("MAINMENU_BG"); } } } diff --git a/OpenRA.Mods.RA/Scripting/Media.cs b/OpenRA.Mods.RA/Scripting/Media.cs index 3db07b3422..d08c8dbcae 100644 --- a/OpenRA.Mods.RA/Scripting/Media.cs +++ b/OpenRA.Mods.RA/Scripting/Media.cs @@ -37,7 +37,7 @@ namespace OpenRA.Scripting if (music) Sound.PlayMusic(); - Widget.CloseWindow(); + Ui.CloseWindow(); Sound.SoundVolumeModifier = oldModifier; w.EnableTick = true; onComplete(); diff --git a/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs index a8fd3c786f..3afb99aba8 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { // Show connection failed dialog CloseWindow(); - Widget.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs() + Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs() { { "onAbort", onAbort }, { "onRetry", onRetry }, @@ -44,7 +44,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic void CloseWindow() { Game.ConnectionStateChanged -= ConnectionStateChanged; - Widget.CloseWindow(); + Ui.CloseWindow(); } [ObjectCreator.UseCtor] @@ -68,7 +68,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic public static void Connect(string host, int port, Action onConnect, Action onAbort) { Game.JoinServer(host, port); - Widget.OpenWindow("CONNECTING_PANEL", new WidgetArgs() + Ui.OpenWindow("CONNECTING_PANEL", new WidgetArgs() { { "host", host }, { "port", port }, @@ -85,8 +85,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic public ConnectionFailedLogic(Widget widget, string host, int port, Action onRetry, Action onAbort) { var panel = widget; - panel.GetWidget("ABORT_BUTTON").OnClick = () => { Widget.CloseWindow(); onAbort(); }; - panel.GetWidget("RETRY_BUTTON").OnClick = () => { Widget.CloseWindow(); onRetry(); }; + panel.GetWidget("ABORT_BUTTON").OnClick = () => { Ui.CloseWindow(); onAbort(); }; + panel.GetWidget("RETRY_BUTTON").OnClick = () => { Ui.CloseWindow(); onRetry(); }; widget.GetWidget("CONNECTING_DESC").GetText = () => "Could not connect to {0}:{1}".F(host, port); diff --git a/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs index 4411f345c1..9f3ced4abf 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 = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); - var devModeButton = Widget.RootWidget.GetWidget("INGAME_DEVELOPERMODE_BUTTON"); + var devmodeBG = Ui.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); + var devModeButton = Ui.RootWidget.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 04fed6c279..8bbce88d17 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 = Widget.RootWidget.GetWidget("INGAME_ROOT"); + var root = Ui.RootWidget.GetWidget("INGAME_ROOT"); var diplomacyBG = root.GetWidget("DIPLOMACY_BG"); var diplomacy = root.GetWidget("INGAME_DIPLOMACY_BUTTON"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/DirectConnectLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DirectConnectLogic.cs index 06a7ee3694..23b8b69914 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DirectConnectLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DirectConnectLogic.cs @@ -33,11 +33,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.Settings.Player.LastServer = "{0}:{1}".F(ipField.Text, port); Game.Settings.Save(); - Widget.CloseWindow(); + Ui.CloseWindow(); ConnectionLogic.Connect(ipField.Text, port, openLobby, onExit); }; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; } } } diff --git a/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs index 2472491522..2d86351484 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs @@ -96,7 +96,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { Game.RunAfterTick(() => { - Widget.CloseWindow(); + Ui.CloseWindow(); afterInstall(); }); } @@ -104,7 +104,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var dl = new Download(installData["PackageURL"], file, onDownloadProgress, onDownloadComplete); - cancelButton.OnClick = () => { dl.Cancel(); Widget.CloseWindow(); }; + cancelButton.OnClick = () => { dl.Cancel(); Ui.CloseWindow(); }; retryButton.OnClick = () => { dl.Cancel(); ShowDownloadDialog(); }; } } diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs index 4f68ab84d8..8245f84a64 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 = Widget.RootWidget; + var r = Ui.RootWidget; gameRoot = r.GetWidget("INGAME_ROOT"); var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG"); @@ -33,8 +33,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic optionsBG.GetWidget("DISCONNECT").OnClick = () => LeaveGame(optionsBG); - optionsBG.GetWidget("SETTINGS").OnClick = () => Widget.OpenWindow("SETTINGS_MENU"); - optionsBG.GetWidget("MUSIC").OnClick = () => Widget.OpenWindow("MUSIC_MENU"); + optionsBG.GetWidget("SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU"); + optionsBG.GetWidget("MUSIC").OnClick = () => Ui.OpenWindow("MUSIC_MENU"); optionsBG.GetWidget("RESUME").OnClick = () => optionsBG.Visible = false; optionsBG.GetWidget("SURRENDER").OnClick = () => @@ -74,8 +74,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic pane.Visible = false; Game.Disconnect(); Game.LoadShellMap(); - Widget.CloseWindow(); - Widget.OpenWindow("MAINMENU_BG"); + Ui.CloseWindow(); + Ui.OpenWindow("MAINMENU_BG"); } void UnregisterEvents() diff --git a/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs index befac04b1f..f9aba168ef 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 = Widget.RootWidget; + var r = Ui.RootWidget; gameRoot = r.GetWidget("OBSERVER_ROOT"); var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG"); @@ -37,12 +37,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic optionsBG.Visible = false; Game.Disconnect(); Game.LoadShellMap(); - Widget.CloseWindow(); - Widget.OpenWindow("MAINMENU_BG"); + Ui.CloseWindow(); + Ui.OpenWindow("MAINMENU_BG"); }; - optionsBG.GetWidget("SETTINGS").OnClick = () => Widget.OpenWindow("SETTINGS_MENU"); - optionsBG.GetWidget("MUSIC").OnClick = () => Widget.OpenWindow("MUSIC_MENU"); + optionsBG.GetWidget("SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU"); + optionsBG.GetWidget("MUSIC").OnClick = () => Ui.OpenWindow("MUSIC_MENU"); optionsBG.GetWidget("RESUME").OnClick = () => optionsBG.Visible = false; optionsBG.GetWidget("SURRENDER").IsVisible = () => false; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 56727332df..be6c8bc118 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic ConnectionLogic.Connect(om.Host, om.Port, onConnect, onExit); }; - Widget.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs() + Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs() { { "onAbort", onExit }, { "onRetry", onRetry }, @@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.AddChatLine -= AddChatLine; Game.ConnectionStateChanged -= ConnectionStateChanged; - Widget.CloseWindow(); + Ui.CloseWindow(); } [ObjectCreator.UseCtor] @@ -135,7 +135,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.Settings.Save(); }); - Widget.OpenWindow("MAPCHOOSER_PANEL", new WidgetArgs() + Ui.OpenWindow("MAPCHOOSER_PANEL", new WidgetArgs() { { "initialMap", Map.Uid }, { "onExit", () => {} }, @@ -192,7 +192,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var musicButton = lobby.GetWidget("MUSIC_BUTTON"); if (musicButton != null) - musicButton.OnClick = () => Widget.OpenWindow("MUSIC_PANEL", new WidgetArgs + musicButton.OnClick = () => Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs { { "onExit", () => {} } }); // Add a bot on the first lobbyinfo update @@ -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 = Widget.RootWidget.GetWidget("TITLE"); + var title = Ui.RootWidget.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 772ca6790e..61ab61269a 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs @@ -21,20 +21,22 @@ namespace OpenRA.Mods.RA.Widgets.Logic { rootMenu = widget; - Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Widget.RootWidget, "PERF_BG" ); + Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Ui.RootWidget, "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"); - widget.GetWidget("MAINMENU_BUTTON_SETTINGS").OnClick = () => Widget.OpenWindow("SETTINGS_MENU"); - widget.GetWidget("MAINMENU_BUTTON_MUSIC").OnClick = () => Widget.OpenWindow("MUSIC_MENU"); + widget.GetWidget("MAINMENU_BUTTON_SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU"); + widget.GetWidget("MAINMENU_BUTTON_MUSIC").OnClick = () => Ui.OpenWindow("MUSIC_MENU"); + widget.GetWidget("MAINMENU_BUTTON_MODS").OnClick = () => - Widget.OpenWindow("MODS_PANEL", new WidgetArgs() + Ui.OpenWindow("MODS_PANEL", new WidgetArgs() { { "onExit", () => {} }, { "onSwitch", RemoveShellmapUI } }); + widget.GetWidget("MAINMENU_BUTTON_REPLAY_VIEWER").OnClick = () => - Widget.OpenWindow("REPLAYBROWSER_BG", new WidgetArgs() + Ui.OpenWindow("REPLAYBROWSER_BG", new WidgetArgs() { { "onExit", () => {} }, { "onStart", RemoveShellmapUI } @@ -49,7 +51,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic void OpenGamePanel(string id) { - Widget.OpenWindow(id, new WidgetArgs() + Ui.OpenWindow(id, new WidgetArgs() { { "onExit", () => {} }, { "openLobby", () => OpenLobbyPanel() } diff --git a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs index 70f7d4cc11..95a67021bd 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs @@ -27,8 +27,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic { map = Game.modData.AvailableMaps[WidgetUtils.ChooseInitialMap(initialMap)]; - widget.GetWidget("BUTTON_OK").OnClick = () => { Widget.CloseWindow(); onSelect(map); }; - widget.GetWidget("BUTTON_CANCEL").OnClick = () => { Widget.CloseWindow(); onExit(); }; + widget.GetWidget("BUTTON_OK").OnClick = () => { Ui.CloseWindow(); onSelect(map); }; + widget.GetWidget("BUTTON_CANCEL").OnClick = () => { Ui.CloseWindow(); onExit(); }; scrollpanel = widget.GetWidget("MAP_LIST"); itemTemplate = scrollpanel.GetWidget("MAP_TEMPLATE"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs index f6327f3048..4247b5d859 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ModBrowserLogic.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic loadButton.OnClick = () => LoadMod(currentMod.Id, onSwitch); loadButton.IsDisabled = () => currentMod.Id == Game.CurrentMods.Keys.First(); - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; currentMod = Mod.AllMods[Game.modData.Manifest.Mods[0]]; // Mod list @@ -51,7 +51,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.RunAfterTick(() => { - Widget.CloseWindow(); + Ui.CloseWindow(); onSwitch(); Game.InitializeWithMods(mods); }); diff --git a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs index 1965195121..695c767a47 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs @@ -34,14 +34,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic public MusicPlayerLogic() { - bg = Widget.RootWidget.GetWidget("MUSIC_MENU"); + bg = Ui.RootWidget.GetWidget("MUSIC_MENU"); CurrentSong = GetNextSong(); bg.GetWidget( "BUTTON_PAUSE" ).IsVisible = () => Sound.MusicPlaying; bg.GetWidget( "BUTTON_PLAY" ).IsVisible = () => !Sound.MusicPlaying; bg.GetWidget("BUTTON_CLOSE").OnClick = - () => { Game.Settings.Save(); Widget.CloseWindow(); }; + () => { Game.Settings.Save(); Ui.CloseWindow(); }; bg.GetWidget("BUTTON_INSTALL").IsVisible = () => false; diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs index cc556779c6..ae8ee3e186 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 = Widget.RootWidget; + var r = Ui.RootWidget; 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 7acb5be232..4fe7f6f3a5 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 = Widget.RootWidget; + var r = Ui.RootWidget; var perfRoot = r.GetWidget("PERF_BG"); perfRoot.IsVisible = () => perfRoot.Visible && Game.Settings.Debug.PerfGraph; diff --git a/OpenRA.Mods.RA/Widgets/Logic/RAInstallFromCDLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/RAInstallFromCDLogic.cs index 736284675b..bfa6444094 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/RAInstallFromCDLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/RAInstallFromCDLogic.cs @@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic statusLabel = panel.GetWidget("STATUS_LABEL"); backButton = panel.GetWidget("BACK_BUTTON"); - backButton.OnClick = Widget.CloseWindow; + backButton.OnClick = Ui.CloseWindow; retryButton = panel.GetWidget("RETRY_BUTTON"); retryButton.OnClick = CheckForDisk; @@ -105,7 +105,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.RunAfterTick(() => { - Widget.CloseWindow(); + Ui.CloseWindow(); continueLoading(); }); } diff --git a/OpenRA.Mods.RA/Widgets/Logic/RAInstallLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/RAInstallLogic.cs index 733c2ced3c..42463ac76e 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/RAInstallLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/RAInstallLogic.cs @@ -22,15 +22,15 @@ namespace OpenRA.Mods.RA.Widgets.Logic var panel = widget.GetWidget("INSTALL_PANEL"); var args = new WidgetArgs() { - { "afterInstall", () => { Widget.CloseWindow(); continueLoading(); } }, + { "afterInstall", () => { Ui.CloseWindow(); continueLoading(); } }, { "installData", installData } }; panel.GetWidget("DOWNLOAD_BUTTON").OnClick = () => - Widget.OpenWindow("INSTALL_DOWNLOAD_PANEL", args); + Ui.OpenWindow("INSTALL_DOWNLOAD_PANEL", args); panel.GetWidget("INSTALL_BUTTON").OnClick = () => - Widget.OpenWindow("INSTALL_FROMCD_PANEL", args); + Ui.OpenWindow("INSTALL_FROMCD_PANEL", args); panel.GetWidget("QUIT_BUTTON").OnClick = Game.Exit; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs index f56d248c6e..018eef6e65 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { panel = widget; - panel.GetWidget("CANCEL_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("CANCEL_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; var rl = panel.GetWidget("REPLAY_LIST"); var replayDir = Path.Combine(Platform.SupportDir, "Replays"); @@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic if (currentReplay != null) { Game.JoinReplay(currentReplay.Filename); - Widget.CloseWindow(); + Ui.CloseWindow(); onStart(); } }; diff --git a/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs index 06c6eff84f..6c179d0953 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ServerBrowserLogic.cs @@ -64,11 +64,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic var host = currentServer.Address.Split(':')[0]; var port = int.Parse(currentServer.Address.Split(':')[1]); - Widget.CloseWindow(); + Ui.CloseWindow(); ConnectionLogic.Connect(host, port, openLobby, onExit); }; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; // Server list serverTemplate = sl.GetWidget("SERVER_TEMPLATE"); diff --git a/OpenRA.Mods.RA/Widgets/Logic/ServerCreationLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ServerCreationLogic.cs index aaa8da3bd3..4d3e4f5814 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ServerCreationLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ServerCreationLogic.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic this.onExit = onExit; var settings = Game.Settings; - panel.GetWidget("BACK_BUTTON").OnClick = () => { Widget.CloseWindow(); onExit(); }; + panel.GetWidget("BACK_BUTTON").OnClick = () => { Ui.CloseWindow(); onExit(); }; panel.GetWidget("CREATE_BUTTON").OnClick = CreateAndJoin; map = Game.modData.AvailableMaps[ WidgetUtils.ChooseInitialMap(Game.Settings.Server.Map) ]; @@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic { panel.GetWidget("MAP_BUTTON").OnClick = () => { - Widget.OpenWindow("MAPCHOOSER_PANEL", new WidgetArgs() + Ui.OpenWindow("MAPCHOOSER_PANEL", new WidgetArgs() { { "initialMap", map.Uid }, { "onExit", () => {} }, @@ -89,7 +89,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic // Create and join the server Game.CreateServer(settings); - Widget.CloseWindow(); + Ui.CloseWindow(); ConnectionLogic.Connect(IPAddress.Loopback.ToString(), Game.Settings.Server.ListenPort, onCreate, onExit); } } diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs index 04d9e2264f..0616410554 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 = Widget.RootWidget.GetWidget("SETTINGS_MENU"); + bg = Ui.RootWidget.GetWidget("SETTINGS_MENU"); var tabs = bg.GetWidget("TAB_CONTAINER"); //Tabs @@ -122,7 +122,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic int.TryParse(windowHeight.Text, out y); gs.WindowedSize = new int2(x,y); Game.Settings.Save(); - Widget.CloseWindow(); + Ui.CloseWindow(); }; } diff --git a/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs b/OpenRA.Mods.RA/Widgets/PowerBinWidget.cs index 6cfd627cc2..a2c2332bab 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 = Widget.RootWidget.GetWidget(RadarBin); + var radarBin = Ui.RootWidget.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 95c9a59132..ffd72fe792 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 = Widget.RootWidget.GetWidget(WorldInteractionController); + var controller = Ui.RootWidget.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 68a0b0b47f..f1079119a3 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 = Widget.RootWidget.GetWidget(WorldInteractionController); + var controller = Ui.RootWidget.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 74ce6f0a64..10839e1f4e 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 = Widget.RootWidget.GetWidget("INGAME_BUILD_PALETTE"); + var palette = Ui.RootWidget.GetWidget("INGAME_BUILD_PALETTE"); if (palette == null) return;