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

Chrome.rootWidget -> Widget.RootWidget

Browse Source
This commit is contained in:
alzeih
2010-07-21 16:14:31 +12:00
parent 795da1b088
commit 647252b0cb
17 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Game.cs
View File

@@ -38,9 +38,6 @@ namespace OpenRA
public static World world; public static World world;
internal static Viewport viewport; internal static Viewport viewport;
public static Controller controller; public static Controller controller;
public static Widget RootWidget {
get { return Chrome.rootWidget; }
}
internal static Chrome chrome; internal static Chrome chrome;
internal static UserSettings Settings; internal static UserSettings Settings;
@@ -629,8 +626,8 @@ namespace OpenRA
JoinLocal(); JoinLocal();
LoadShellMap(shellmap); LoadShellMap(shellmap);
Chrome.rootWidget.CloseWindow(); Widget.RootWidget.CloseWindow();
Chrome.rootWidget.OpenWindow("MAINMENU_BG"); Widget.RootWidget.OpenWindow("MAINMENU_BG");
} }
static string baseSupportDir = null; static string baseSupportDir = null;

3
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -13,6 +13,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Support; using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Widgets;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
@@ -69,7 +70,7 @@ namespace OpenRA.Graphics
Game.chrome.Draw(world); Game.chrome.Draw(world);
Timer.Time( "widgets: {0}" ); 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); var c = new Cursor(cursorName);
cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), "cursor"); cursorRenderer.DrawSprite(c.GetSprite((int)cursorFrame), mousePos + Location - c.GetHotspot(), "cursor");
Timer.Time( "cursors: {0}" ); Timer.Time( "cursors: {0}" );

2
OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Traits
if (produces == null) if (produces == null)
return; return;
Chrome.rootWidget.GetWidget<BuildPaletteWidget>("INGAME_BUILD_PALETTE") Widget.RootWidget.GetWidget<BuildPaletteWidget>("INGAME_BUILD_PALETTE")
.SetCurrentTab(produces); .SetCurrentTab(produces);
} }
} }

2
OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Widgets.Delegates
{ {
public ConnectionDialogsDelegate() public ConnectionDialogsDelegate()
{ {
var r = Chrome.rootWidget; var r = Widget.RootWidget;
r.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => { r.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => {
r.GetWidget("CONNECTION_BUTTON_ABORT").Parent.Visible = false; r.GetWidget("CONNECTION_BUTTON_ABORT").Parent.Visible = false;
Game.Disconnect(); Game.Disconnect();

4
OpenRA.Game/Widgets/Delegates/CreateServerMenuDelegate.cs
View File

@@ -17,8 +17,8 @@ namespace OpenRA.Widgets.Delegates
{ {
public CreateServerMenuDelegate() public CreateServerMenuDelegate()
{ {
var r = Chrome.rootWidget; var r = Widget.RootWidget;
var cs = Chrome.rootWidget.GetWidget("CREATESERVER_BG"); var cs = r.GetWidget("CREATESERVER_BG");
r.GetWidget("MAINMENU_BUTTON_CREATE").OnMouseUp = mi => { r.GetWidget("MAINMENU_BUTTON_CREATE").OnMouseUp = mi => {
r.OpenWindow("CREATESERVER_BG"); r.OpenWindow("CREATESERVER_BG");
return true; return true;

4
OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs
View File

@@ -35,8 +35,8 @@ namespace OpenRA.Widgets.Delegates
public DeveloperModeDelegate () public DeveloperModeDelegate ()
{ {
var devmodeBG = Chrome.rootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG");
var devModeButton = Chrome.rootWidget.GetWidget<ButtonWidget>("INGAME_DEVELOPERMODE_BUTTON"); var devModeButton = Widget.RootWidget.GetWidget<ButtonWidget>("INGAME_DEVELOPERMODE_BUTTON");
devModeButton.OnMouseUp = mi => devModeButton.OnMouseUp = mi =>
{ {

4
OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs
View File

@@ -22,9 +22,9 @@ namespace OpenRA.Widgets.Delegates
public DiplomacyDelegate() 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; diplomacyBG.Visible = !diplomacyBG.Visible;
if (diplomacyBG.IsVisible()) if (diplomacyBG.IsVisible())

2
OpenRA.Game/Widgets/Delegates/IngameChromeDelegate.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Widgets.Delegates
{ {
public IngameChromeDelegate() public IngameChromeDelegate()
{ {
var r = Chrome.rootWidget; var r = Widget.RootWidget;
var gameRoot = r.GetWidget("INGAME_ROOT"); var gameRoot = r.GetWidget("INGAME_ROOT");
var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG"); var optionsBG = gameRoot.GetWidget("INGAME_OPTIONS_BG");

8
OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
View File

@@ -32,9 +32,9 @@ namespace OpenRA.Widgets.Delegates
Game.LobbyInfoChanged += UpdateCurrentMap; Game.LobbyInfoChanged += UpdateCurrentMap;
UpdateCurrentMap(); UpdateCurrentMap();
var r = Chrome.rootWidget; var r = Widget.RootWidget;
var lobby = r.GetWidget("SERVER_LOBBY"); 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"); LocalPlayerTemplate = Players.GetWidget("TEMPLATE_LOCAL");
RemotePlayerTemplate = Players.GetWidget("TEMPLATE_REMOTE"); RemotePlayerTemplate = Players.GetWidget("TEMPLATE_REMOTE");
@@ -254,7 +254,7 @@ namespace OpenRA.Widgets.Delegates
var color = template.GetWidget<ButtonWidget>("COLOR"); var color = template.GetWidget<ButtonWidget>("COLOR");
color.OnMouseUp = mi => 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<SliderWidget>("HUE_SLIDER"); var hueSlider = colorChooser.GetWidget<SliderWidget>("HUE_SLIDER");
hueSlider.Offset = Game.LocalClient.Color1.GetHue()/360f; hueSlider.Offset = Game.LocalClient.Color1.GetHue()/360f;
@@ -348,7 +348,7 @@ namespace OpenRA.Widgets.Delegates
bool CycleReady(MouseInput mi) bool CycleReady(MouseInput mi)
{ {
//HACK: Can't set this as part of the fuction as LocalClient/State not initalised yet //HACK: Can't set this as part of the fuction as LocalClient/State not initalised yet
Chrome.rootWidget.GetWidget("SERVER_LOBBY").GetWidget<ButtonWidget>("CHANGEMAP_BUTTON").Visible Widget.RootWidget.GetWidget("SERVER_LOBBY").GetWidget<ButtonWidget>("CHANGEMAP_BUTTON").Visible
= (Game.IsHost && Game.LocalClient.State == Session.ClientState.Ready); = (Game.IsHost && Game.LocalClient.State == Session.ClientState.Ready);
Game.IssueOrder(Order.Command("ready")); Game.IssueOrder(Order.Command("ready"));
return true; return true;

4
OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs
View File

@@ -18,9 +18,9 @@ namespace OpenRA.Widgets.Delegates
{ {
// Main menu is the default window // Main menu is the default window
Widget.WindowList.Push("MAINMENU_BG"); 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<LabelWidget>("VERSION_STRING"); var version = Widget.RootWidget.GetWidget("MAINMENU_BG").GetWidget<LabelWidget>("VERSION_STRING");
if (FileSystem.Exists("VERSION")) if (FileSystem.Exists("VERSION"))
{ {

2
OpenRA.Game/Widgets/Delegates/MapChooserDelegate.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Widgets.Delegates
MapStub Map = null; MapStub Map = null;
public MapChooserDelegate() public MapChooserDelegate()
{ {
var r = Chrome.rootWidget; var r = Widget.RootWidget;
var bg = r.GetWidget("MAP_CHOOSER"); var bg = r.GetWidget("MAP_CHOOSER");
bg.SpecialOneArg = (map) => RefreshMapList(map); bg.SpecialOneArg = (map) => RefreshMapList(map);
var ml = bg.GetWidget<ListBoxWidget>("MAP_LIST"); var ml = bg.GetWidget<ListBoxWidget>("MAP_LIST");

2
OpenRA.Game/Widgets/Delegates/MusicPlayerDelegate.cs
View File

@@ -14,7 +14,7 @@ namespace OpenRA.Widgets.Delegates
{ {
public MusicPlayerDelegate() public MusicPlayerDelegate()
{ {
var bg = Chrome.rootWidget.GetWidget("MUSIC_BG"); var bg = Widget.RootWidget.GetWidget("MUSIC_BG");
bg.Visible = Game.Settings.MusicPlayer; bg.Visible = Game.Settings.MusicPlayer;
bg.GetWidget("BUTTON_PLAY").OnMouseUp = mi => bg.GetWidget("BUTTON_PLAY").OnMouseUp = mi =>

2
OpenRA.Game/Widgets/Delegates/PerfDebugDelegate.cs
View File

@@ -16,7 +16,7 @@ namespace OpenRA.Widgets.Delegates
{ {
public PerfDebugDelegate() public PerfDebugDelegate()
{ {
var r = Chrome.rootWidget; var r = Widget.RootWidget;
var perfRoot = r.GetWidget("PERF_BG"); var perfRoot = r.GetWidget("PERF_BG");
perfRoot.IsVisible = () => perfRoot.Visible && Game.Settings.PerfDebug; perfRoot.IsVisible = () => perfRoot.Visible && Game.Settings.PerfDebug;

4
OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Widgets.Delegates
public ServerBrowserDelegate() public ServerBrowserDelegate()
{ {
var r = Chrome.rootWidget; var r = Widget.RootWidget;
var bg = r.GetWidget("JOINSERVER_BG"); var bg = r.GetWidget("JOINSERVER_BG");
var dc = r.GetWidget("DIRECTCONNECT_BG"); var dc = r.GetWidget("DIRECTCONNECT_BG");
@@ -157,7 +157,7 @@ namespace OpenRA.Widgets.Delegates
void RefreshServerList(IEnumerable<GameServer> games) void RefreshServerList(IEnumerable<GameServer> games)
{ {
var r = Chrome.rootWidget; var r = Widget.RootWidget;
var bg = r.GetWidget("JOINSERVER_BG"); var bg = r.GetWidget("JOINSERVER_BG");
var sl = bg.GetWidget<ListBoxWidget>("SERVER_LIST"); var sl = bg.GetWidget<ListBoxWidget>("SERVER_LIST");

10
OpenRA.Game/Widgets/Delegates/SettingsMenuDelegate.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Widgets.Delegates
Widget bg; Widget bg;
public SettingsMenuDelegate() public SettingsMenuDelegate()
{ {
bg = Chrome.rootWidget.GetWidget<BackgroundWidget>("SETTINGS_MENU"); bg = Widget.RootWidget.GetWidget<BackgroundWidget>("SETTINGS_MENU");
var tabs = bg.GetWidget<ContainerWidget>("TAB_CONTAINER"); var tabs = bg.GetWidget<ContainerWidget>("TAB_CONTAINER");
//Tabs //Tabs
@@ -62,7 +62,7 @@ namespace OpenRA.Widgets.Delegates
music.OnMouseDown = mi => music.OnMouseDown = mi =>
{ {
Game.Settings.MusicPlayer ^= true; Game.Settings.MusicPlayer ^= true;
Chrome.rootWidget.GetWidget("MUSIC_BG").Visible = Game.Settings.MusicPlayer; Widget.RootWidget.GetWidget("MUSIC_BG").Visible = Game.Settings.MusicPlayer;
return true; return true;
}; };
@@ -166,13 +166,13 @@ namespace OpenRA.Widgets.Delegates
bg.GetWidget("BUTTON_CLOSE").OnMouseUp = mi => { bg.GetWidget("BUTTON_CLOSE").OnMouseUp = mi => {
Game.Settings.Save(); Game.Settings.Save();
Chrome.rootWidget.CloseWindow(); Widget.RootWidget.CloseWindow();
return true; return true;
}; };
// Menu Buttons // Menu Buttons
Chrome.rootWidget.GetWidget("MAINMENU_BUTTON_SETTINGS").OnMouseUp = mi => { Widget.RootWidget.GetWidget("MAINMENU_BUTTON_SETTINGS").OnMouseUp = mi => {
Chrome.rootWidget.OpenWindow("SETTINGS_MENU"); Widget.RootWidget.OpenWindow("SETTINGS_MENU");
return true; return true;
}; };

12
OpenRA.Game/Widgets/Widget.cs
View File

@@ -47,6 +47,10 @@ namespace OpenRA.Widgets
public Widget() { IsVisible = () => Visible; } public Widget() { IsVisible = () => Visible; }
public static Widget RootWidget {
get { return Chrome.rootWidget; }
}
public Widget(Widget widget) public Widget(Widget widget)
{ {
Id = widget.Id; Id = widget.Id;
@@ -276,17 +280,17 @@ namespace OpenRA.Widgets
public void CloseWindow() public void CloseWindow()
{ {
Chrome.rootWidget.GetWidget(WindowList.Pop()).Visible = false; Widget.RootWidget.GetWidget(WindowList.Pop()).Visible = false;
if (WindowList.Count > 0) if (WindowList.Count > 0)
Chrome.rootWidget.GetWidget(WindowList.Peek()).Visible = true; Widget.RootWidget.GetWidget(WindowList.Peek()).Visible = true;
} }
public Widget OpenWindow(string id) public Widget OpenWindow(string id)
{ {
if (WindowList.Count > 0) if (WindowList.Count > 0)
Chrome.rootWidget.GetWidget(WindowList.Peek()).Visible = false; Widget.RootWidget.GetWidget(WindowList.Peek()).Visible = false;
WindowList.Push(id); WindowList.Push(id);
var window = Chrome.rootWidget.GetWidget(id); var window = Widget.RootWidget.GetWidget(id);
window.Visible = true; window.Visible = true;
return window; return window;
} }

2
OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
{ {
public OrderButtonsChromeDelegate() public OrderButtonsChromeDelegate()
{ {
var r = Game.RootWidget; var r = Widget.RootWidget;
var gameRoot = r.GetWidget("INGAME_ROOT"); var gameRoot = r.GetWidget("INGAME_ROOT");
var moneybin = gameRoot.GetWidget("INGAME_MONEY_BIN"); var moneybin = gameRoot.GetWidget("INGAME_MONEY_BIN");