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

Make Game.LoadWidget / Widget.LoadWidget consistent.

Browse Source
This commit is contained in:
Paul Chote
2011-05-13 15:53:46 +12:00
parent 21267688b0
commit 1526b6ff37
7 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/CncLoadScreen.cs
View File

@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Cnc
{ "continueLoading", () => TestAndContinue() },
{ "installData", Info }
};
Widget.LoadWidget(Info["InstallerBackgroundWidget"], args);
Widget.LoadWidget(Info["InstallerBackgroundWidget"], Widget.RootWidget, args);
Widget.OpenWindow(Info["InstallerMenuWidget"], args);
}
else

5
OpenRA.Mods.Cnc/Widgets/CncIngameChromeLogic.cs
View File

@@ -59,7 +59,10 @@ namespace OpenRA.Mods.Cnc.Widgets
ingameRoot.GetWidget<CncMenuButtonWidget>("OPTIONS_BUTTON").OnClick = () =>
{
ingameRoot.IsVisible = () => false;
Widget.LoadWidget("INGAME_MENU", new WidgetArgs() {{ "world", world }, { "onExit", () => ingameRoot.IsVisible = () => true }});
Game.LoadWidget(world, "INGAME_MENU", Widget.RootWidget, new WidgetArgs()
{
{ "onExit", () => ingameRoot.IsVisible = () => true }
});
};
var postgameBG = ingameRoot.GetWidget("POSTGAME_BG");

2
OpenRA.Mods.Cnc/Widgets/CncLobbyLogic.cs
View File

@@ -402,7 +402,7 @@ namespace OpenRA.Mods.Cnc.Widgets
CurrentColorPreview = c;
};
var colorChooser = Game.LoadWidget(orderManager.world, "COLOR_CHOOSER", new WidgetArgs()
var colorChooser = Game.LoadWidget(orderManager.world, "COLOR_CHOOSER", null, new WidgetArgs()
{
{ "onSelect", onSelect },
{ "onChange", onChange },