From 647252b0cbc12bfae52605951340043339260e5a Mon Sep 17 00:00:00 2001 From: alzeih Date: Wed, 21 Jul 2010 16:14:31 +1200 Subject: [PATCH] Chrome.rootWidget -> Widget.RootWidget --- OpenRA.Game/Game.cs | 7 ++----- OpenRA.Game/Graphics/Viewport.cs | 3 ++- OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs | 2 +- .../Widgets/Delegates/ConnectionDialogsDelegate.cs | 2 +- .../Widgets/Delegates/CreateServerMenuDelegate.cs | 4 ++-- .../Widgets/Delegates/DeveloperModeDelegate.cs | 4 ++-- OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs | 4 ++-- .../Widgets/Delegates/IngameChromeDelegate.cs | 2 +- OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs | 8 ++++---- .../Widgets/Delegates/MainMenuButtonsDelegate.cs | 4 ++-- OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs | 2 +- OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs | 2 +- OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs | 2 +- .../Widgets/Delegates/ServerBrowserDelegate.cs | 4 ++-- .../Widgets/Delegates/SettingsMenuDelegate.cs | 10 +++++----- OpenRA.Game/Widgets/Widget.cs | 12 ++++++++---- .../Widgets/Delegates/OrderButtonsChromeDelegate.cs | 2 +- 17 files changed, 38 insertions(+), 36 deletions(-) diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index d55847bad7..8febdd7df6 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -38,9 +38,6 @@ namespace OpenRA public static World world; internal static Viewport viewport; public static Controller controller; - public static Widget RootWidget { - get { return Chrome.rootWidget; } - } internal static Chrome chrome; internal static UserSettings Settings; @@ -629,8 +626,8 @@ namespace OpenRA JoinLocal(); LoadShellMap(shellmap); - Chrome.rootWidget.CloseWindow(); - Chrome.rootWidget.OpenWindow("MAINMENU_BG"); + Widget.RootWidget.CloseWindow(); + Widget.RootWidget.OpenWindow("MAINMENU_BG"); } static string baseSupportDir = null; diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs index 76b1252efd..68a1a2045a 100644 --- a/OpenRA.Game/Graphics/Viewport.cs +++ b/OpenRA.Game/Graphics/Viewport.cs @@ -13,6 +13,7 @@ using System.Drawing; using System.Linq; using OpenRA.Support; using OpenRA.Traits; +using OpenRA.Widgets; namespace OpenRA.Graphics { @@ -69,7 +70,7 @@ namespace OpenRA.Graphics Game.chrome.Draw(world); Timer.Time( "widgets: {0}" ); - var cursorName = Chrome.rootWidget.GetCursorOuter(mousePos) ?? Game.controller.ChooseCursor( world ); + var cursorName = Widget.RootWidget.GetCursorOuter(mousePos) ?? Game.controller.ChooseCursor( world ); var c = new Cursor(cursorName); cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), "cursor"); Timer.Time( "cursors: {0}" ); diff --git a/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs b/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs index d2255b9173..0984591789 100644 --- a/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs +++ b/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs @@ -29,7 +29,7 @@ namespace OpenRA.Traits if (produces == null) return; - Chrome.rootWidget.GetWidget("INGAME_BUILD_PALETTE") + Widget.RootWidget.GetWidget("INGAME_BUILD_PALETTE") .SetCurrentTab(produces); } } diff --git a/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs b/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs index e7cea5a39b..98bb05b703 100644 --- a/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs @@ -16,7 +16,7 @@ namespace OpenRA.Widgets.Delegates { public ConnectionDialogsDelegate() { - var r = Chrome.rootWidget; + var r = Widget.RootWidget; r.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => { r.GetWidget("CONNECTION_BUTTON_ABORT").Parent.Visible = false; Game.Disconnect(); diff --git a/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs b/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs index 8b2ab15626..2d0ecff83f 100644 --- a/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs @@ -17,8 +17,8 @@ namespace OpenRA.Widgets.Delegates { public CreateServerMenuDelegate() { - var r = Chrome.rootWidget; - var cs = Chrome.rootWidget.GetWidget("CREATESERVER_BG"); + var r = Widget.RootWidget; + var cs = r.GetWidget("CREATESERVER_BG"); r.GetWidget("MAINMENU_BUTTON_CREATE").OnMouseUp = mi => { r.OpenWindow("CREATESERVER_BG"); return true; diff --git a/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs b/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs index 145feec059..fc2a864a07 100644 --- a/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs @@ -35,8 +35,8 @@ namespace OpenRA.Widgets.Delegates public DeveloperModeDelegate () { - var devmodeBG = Chrome.rootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); - var devModeButton = Chrome.rootWidget.GetWidget("INGAME_DEVELOPERMODE_BUTTON"); + var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); + var devModeButton = Widget.RootWidget.GetWidget("INGAME_DEVELOPERMODE_BUTTON"); devModeButton.OnMouseUp = mi => { diff --git a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs b/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs index 70839aff59..ae13e33b94 100644 --- a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs @@ -22,9 +22,9 @@ namespace OpenRA.Widgets.Delegates public DiplomacyDelegate() { - var diplomacyBG = Chrome.rootWidget.GetWidget("DIPLOMACY_BG"); + var diplomacyBG = Widget.RootWidget.GetWidget("DIPLOMACY_BG"); - Chrome.rootWidget.GetWidget("INGAME_DIPLOMACY_BUTTON").OnMouseUp = mi => + Widget.RootWidget.GetWidget("INGAME_DIPLOMACY_BUTTON").OnMouseUp = mi => { diplomacyBG.Visible = !diplomacyBG.Visible; if (diplomacyBG.IsVisible()) diff --git a/OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs b/OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs index 278d0cdf25..2751732595 100644 --- a/OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs @@ -16,7 +16,7 @@ namespace OpenRA.Widgets.Delegates { public IngameChromeDelegate() { - var r = Chrome.rootWidget; + var r = Widget.RootWidget; var gameRoot = r.GetWidget("INGAME_ROOT"); var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG"); diff --git a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs b/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs index ee624468c9..1e8a25ea7b 100644 --- a/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs @@ -32,9 +32,9 @@ namespace OpenRA.Widgets.Delegates Game.LobbyInfoChanged += UpdateCurrentMap; UpdateCurrentMap(); - var r = Chrome.rootWidget; + var r = Widget.RootWidget; var lobby = r.GetWidget("SERVER_LOBBY"); - Players = Chrome.rootWidget.GetWidget("SERVER_LOBBY").GetWidget("PLAYERS"); + Players = Widget.RootWidget.GetWidget("SERVER_LOBBY").GetWidget("PLAYERS"); LocalPlayerTemplate = Players.GetWidget("TEMPLATE_LOCAL"); RemotePlayerTemplate = Players.GetWidget("TEMPLATE_REMOTE"); @@ -254,7 +254,7 @@ namespace OpenRA.Widgets.Delegates var color = template.GetWidget("COLOR"); color.OnMouseUp = mi => { - var colorChooser = Chrome.rootWidget.GetWidget("SERVER_LOBBY").GetWidget("COLOR_CHOOSER"); + var colorChooser = Widget.RootWidget.GetWidget("SERVER_LOBBY").GetWidget("COLOR_CHOOSER"); var hueSlider = colorChooser.GetWidget("HUE_SLIDER"); hueSlider.Offset = Game.LocalClient.Color1.GetHue()/360f; @@ -348,7 +348,7 @@ namespace OpenRA.Widgets.Delegates bool CycleReady(MouseInput mi) { //HACK: Can't set this as part of the fuction as LocalClient/State not initalised yet - Chrome.rootWidget.GetWidget("SERVER_LOBBY").GetWidget("CHANGEMAP_BUTTON").Visible + Widget.RootWidget.GetWidget("SERVER_LOBBY").GetWidget("CHANGEMAP_BUTTON").Visible = (Game.IsHost && Game.LocalClient.State == Session.ClientState.Ready); Game.IssueOrder(Order.Command("ready")); return true; diff --git a/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs b/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs index 082a91ef71..e8dd29fc5d 100644 --- a/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs @@ -18,9 +18,9 @@ namespace OpenRA.Widgets.Delegates { // Main menu is the default window Widget.WindowList.Push("MAINMENU_BG"); - Chrome.rootWidget.GetWidget("MAINMENU_BUTTON_QUIT").OnMouseUp = mi => { Game.Exit(); return true; }; + Widget.RootWidget.GetWidget("MAINMENU_BUTTON_QUIT").OnMouseUp = mi => { Game.Exit(); return true; }; - var version = Chrome.rootWidget.GetWidget("MAINMENU_BG").GetWidget("VERSION_STRING"); + var version = Widget.RootWidget.GetWidget("MAINMENU_BG").GetWidget("VERSION_STRING"); if (FileSystem.Exists("VERSION")) { diff --git a/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs b/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs index c61c0985a9..7f1b534599 100644 --- a/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs @@ -19,7 +19,7 @@ namespace OpenRA.Widgets.Delegates MapStub Map = null; public MapChooserDelegate() { - var r = Chrome.rootWidget; + var r = Widget.RootWidget; var bg = r.GetWidget("MAP_CHOOSER"); bg.SpecialOneArg = (map) => RefreshMapList(map); var ml = bg.GetWidget("MAP_LIST"); diff --git a/OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs b/OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs index 596c4f52af..0378f47bb3 100644 --- a/OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs @@ -14,7 +14,7 @@ namespace OpenRA.Widgets.Delegates { public MusicPlayerDelegate() { - var bg = Chrome.rootWidget.GetWidget("MUSIC_BG"); + var bg = Widget.RootWidget.GetWidget("MUSIC_BG"); bg.Visible = Game.Settings.MusicPlayer; bg.GetWidget("BUTTON_PLAY").OnMouseUp = mi => diff --git a/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs b/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs index 8ce6584487..faa4810298 100644 --- a/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs @@ -16,7 +16,7 @@ namespace OpenRA.Widgets.Delegates { public PerfDebugDelegate() { - var r = Chrome.rootWidget; + var r = Widget.RootWidget; var perfRoot = r.GetWidget("PERF_BG"); perfRoot.IsVisible = () => perfRoot.Visible && Game.Settings.PerfDebug; diff --git a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs index 190df20eff..5d8c06426c 100644 --- a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs @@ -25,7 +25,7 @@ namespace OpenRA.Widgets.Delegates public ServerBrowserDelegate() { - var r = Chrome.rootWidget; + var r = Widget.RootWidget; var bg = r.GetWidget("JOINSERVER_BG"); var dc = r.GetWidget("DIRECTCONNECT_BG"); @@ -157,7 +157,7 @@ namespace OpenRA.Widgets.Delegates void RefreshServerList(IEnumerable games) { - var r = Chrome.rootWidget; + var r = Widget.RootWidget; var bg = r.GetWidget("JOINSERVER_BG"); var sl = bg.GetWidget("SERVER_LIST"); diff --git a/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs b/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs index 25ebad66a4..0144c17679 100644 --- a/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs @@ -20,7 +20,7 @@ namespace OpenRA.Widgets.Delegates Widget bg; public SettingsMenuDelegate() { - bg = Chrome.rootWidget.GetWidget("SETTINGS_MENU"); + bg = Widget.RootWidget.GetWidget("SETTINGS_MENU"); var tabs = bg.GetWidget("TAB_CONTAINER"); //Tabs @@ -62,7 +62,7 @@ namespace OpenRA.Widgets.Delegates music.OnMouseDown = mi => { Game.Settings.MusicPlayer ^= true; - Chrome.rootWidget.GetWidget("MUSIC_BG").Visible = Game.Settings.MusicPlayer; + Widget.RootWidget.GetWidget("MUSIC_BG").Visible = Game.Settings.MusicPlayer; return true; }; @@ -166,13 +166,13 @@ namespace OpenRA.Widgets.Delegates bg.GetWidget("BUTTON_CLOSE").OnMouseUp = mi => { Game.Settings.Save(); - Chrome.rootWidget.CloseWindow(); + Widget.RootWidget.CloseWindow(); return true; }; // Menu Buttons - Chrome.rootWidget.GetWidget("MAINMENU_BUTTON_SETTINGS").OnMouseUp = mi => { - Chrome.rootWidget.OpenWindow("SETTINGS_MENU"); + Widget.RootWidget.GetWidget("MAINMENU_BUTTON_SETTINGS").OnMouseUp = mi => { + Widget.RootWidget.OpenWindow("SETTINGS_MENU"); return true; }; diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index da544ceff9..4e95145577 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -47,6 +47,10 @@ namespace OpenRA.Widgets public Widget() { IsVisible = () => Visible; } + public static Widget RootWidget { + get { return Chrome.rootWidget; } + } + public Widget(Widget widget) { Id = widget.Id; @@ -276,17 +280,17 @@ namespace OpenRA.Widgets public void CloseWindow() { - Chrome.rootWidget.GetWidget(WindowList.Pop()).Visible = false; + Widget.RootWidget.GetWidget(WindowList.Pop()).Visible = false; if (WindowList.Count > 0) - Chrome.rootWidget.GetWidget(WindowList.Peek()).Visible = true; + Widget.RootWidget.GetWidget(WindowList.Peek()).Visible = true; } public Widget OpenWindow(string id) { if (WindowList.Count > 0) - Chrome.rootWidget.GetWidget(WindowList.Peek()).Visible = false; + Widget.RootWidget.GetWidget(WindowList.Peek()).Visible = false; WindowList.Push(id); - var window = Chrome.rootWidget.GetWidget(id); + var window = Widget.RootWidget.GetWidget(id); window.Visible = true; return window; } diff --git a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs index f50f403e03..7d0bc3d2d8 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs @@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates { public OrderButtonsChromeDelegate() { - var r = Game.RootWidget; + var r = Widget.RootWidget; var gameRoot = r.GetWidget("INGAME_ROOT"); var moneybin = gameRoot.GetWidget("INGAME_MONEY_BIN");