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

rename Ui.RootWidget to just Ui.Root

Browse Source
This commit is contained in:
Chris Forbes
2011-12-13 23:46:58 +13:00
parent 58f6816d84
commit bf5be88c75
30 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/NullLoadScreen.cs
View File

@@ -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" );
}
}
}

6
OpenRA.Mods.RA/OpenWidgetAtGameStart.cs
View File

@@ -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());
}
}
}

4
OpenRA.Mods.RA/Widgets/Logic/DeveloperModeLogic.cs
View File

@@ -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<ButtonWidget>("INGAME_DEVELOPERMODE_BUTTON");
var devmodeBG = Ui.Root.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG");
var devModeButton = Ui.Root.GetWidget<ButtonWidget>("INGAME_DEVELOPERMODE_BUTTON");
devModeButton.OnClick = () => devmodeBG.Visible ^= true;
var devTrait = world.LocalPlayer.PlayerActor.Trait<DeveloperMode>();

2
OpenRA.Mods.RA/Widgets/Logic/DiplomacyLogic.cs
View File

@@ -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<ButtonWidget>("INGAME_DIPLOMACY_BUTTON");

2
OpenRA.Mods.RA/Widgets/Logic/IngameChromeLogic.cs
View File

@@ -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");

2
OpenRA.Mods.RA/Widgets/Logic/IngameObserverChromeLogic.cs
View File

@@ -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");

2
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -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<LabelWidget>("TITLE");
var title = Ui.Root.GetWidget<LabelWidget>("TITLE");
title.Text = orderManager.LobbyInfo.GlobalSettings.ServerName;
}

2
OpenRA.Mods.RA/Widgets/Logic/MainMenuButtonsLogic.cs
View File

@@ -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<ButtonWidget>("MAINMENU_BUTTON_JOIN").OnClick = () => OpenGamePanel("JOINSERVER_BG");
widget.GetWidget<ButtonWidget>("MAINMENU_BUTTON_CREATE").OnClick = () => OpenGamePanel("CREATESERVER_BG");
widget.GetWidget<ButtonWidget>("MAINMENU_BUTTON_DIRECTCONNECT").OnClick = () => OpenGamePanel("DIRECTCONNECT_BG");

2
OpenRA.Mods.RA/Widgets/Logic/MusicPlayerLogic.cs
View File

@@ -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;

2
OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
View File

@@ -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");

2
OpenRA.Mods.RA/Widgets/Logic/PerfDebugLogic.cs
View File

@@ -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;

2
OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs
View File

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public SettingsMenuLogic()
{
bg = Ui.RootWidget.GetWidget<BackgroundWidget>("SETTINGS_MENU");
bg = Ui.Root.GetWidget<BackgroundWidget>("SETTINGS_MENU");
var tabs = bg.GetWidget<ContainerWidget>("TAB_CONTAINER");
//Tabs

2
OpenRA.Mods.RA/Widgets/PowerBinWidget.cs
View File

@@ -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<RadarBinWidget>(RadarBin);
var radarBin = Ui.Root.GetWidget<RadarBinWidget>(RadarBin);
powerCollection = "power-" + world.LocalPlayer.Country.Race;

2
OpenRA.Mods.RA/Widgets/RadarBinWidget.cs
View File

@@ -113,7 +113,7 @@ namespace OpenRA.Mods.RA.Widgets
if (WorldInteractionController != null)
{
var controller = Ui.RootWidget.GetWidget<WorldInteractionControllerWidget>(WorldInteractionController);
var controller = Ui.Root.GetWidget<WorldInteractionControllerWidget>(WorldInteractionController);
controller.HandleMouseInput(fakemi);
fakemi.Event = MouseInputEvent.Up;
controller.HandleMouseInput(fakemi);

2
OpenRA.Mods.RA/Widgets/RadarWidget.cs
View File

@@ -110,7 +110,7 @@ namespace OpenRA.Mods.RA.Widgets
if (WorldInteractionController != null)
{
var controller = Ui.RootWidget.GetWidget<WorldInteractionControllerWidget>(WorldInteractionController);
var controller = Ui.Root.GetWidget<WorldInteractionControllerWidget>(WorldInteractionController);
controller.HandleMouseInput(fakemi);
fakemi.Event = MouseInputEvent.Up;
controller.HandleMouseInput(fakemi);

2
OpenRA.Mods.RA/World/ChooseBuildTabOnSelect.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA
public void SelectionChanged()
{
var palette = Ui.RootWidget.GetWidget<BuildPaletteWidget>("INGAME_BUILD_PALETTE");
var palette = Ui.Root.GetWidget<BuildPaletteWidget>("INGAME_BUILD_PALETTE");
if (palette == null)
return;