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

Let panels handle closing themselves

Browse Source
This commit is contained in:
Paul Chote
2011-05-12 20:14:23 +12:00
parent 5fffc9d816
commit 61facc7bb1
11 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{
this.orderManager = orderManager;
this.worldRenderer = worldRenderer;
this.OnGameStart = onStart;
this.OnGameStart = () => { Widget.CloseWindow(); onStart(); };
this.onExit = onExit;
if (!staticSetup)
@@ -195,20 +195,19 @@ namespace OpenRA.Mods.Cnc.Widgets
orderManager.IssueOrder(Order.Command("map " + m.Uid));
Game.Settings.Server.LastMap = m.Uid;
Game.Settings.Save();
Widget.CloseWindow();
});
Widget.OpenWindow( "MAPCHOOSER_PANEL", new Dictionary<string, object>
{
{ "initialMap", Map.Uid },
{ "onExit", new Action(() => Widget.CloseWindow()) },
{ "onExit", new Action(() => {}) },
{ "onSelect", onSelect }
});
};
mapButton.IsVisible = () => mapButton.Visible && Game.IsHost;
var disconnectButton = lobby.GetWidget<CncMenuButtonWidget>("DISCONNECT_BUTTON");
disconnectButton.OnClick = onExit;
disconnectButton.OnClick = () => { Widget.CloseWindow(); onExit(); };
var gameStarting = false;
var lockTeamsCheckbox = lobby.GetWidget<CncCheckboxWidget>("LOCKTEAMS_CHECKBOX");