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

Add a hook for widgets being removed, and ensure widgets are removed consistently.

Browse Source
This commit is contained in:
Paul Chote
2011-05-31 21:14:28 +12:00
parent bbce4368d9
commit ad3f378545
9 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA
public void StartGame()
{
Widget.RootWidget.RemoveChildren();
Widget.ResetAll();
Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Widget.RootWidget, "INIT_SETUP" );
}
}

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

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA
public void WorldLoaded(World world)
{
// Remove all open widgets
Widget.RootWidget.Children.Clear();
Widget.ResetAll();
if (world.LocalPlayer != null)
Game.OpenWindow(world, Info.Widget);

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

@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA
public void StartGame()
{
Widget.RootWidget.RemoveChildren();
Widget.ResetAll();
Game.modData.WidgetLoader.LoadWidget( new WidgetArgs(), Widget.RootWidget, "INIT_SETUP" );
}
}

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

@@ -47,7 +47,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
// This is shit
void LayoutDialog(Widget bg)
{
bg.Children.RemoveAll(w => controls.Contains(w));
foreach (var c in controls)
bg.RemoveChild(c);
controls.Clear();
var y = 50;

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

@@ -68,7 +68,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
Game.LoadShellMap();
if (Info.InstallMode != "cnc")
{
Widget.RootWidget.RemoveChildren();
Widget.ResetAll();
Widget.OpenWindow("MAINMENU_BG");
}
}