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

Revert replacing generic Ui.OpenWindow with static method in MusicPlayerLogic

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-05-10 18:27:30 +03:00
parent 10b8093d5a
commit d9db1c1854
5 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs
View File

@@ -65,7 +65,10 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
menu.Get<ButtonWidget>("MUSIC_BUTTON").OnClick = () => menu.Get<ButtonWidget>("MUSIC_BUTTON").OnClick = () =>
{ {
hideButtons = true; hideButtons = true;
MusicPlayerLogic.OpenWindow(world, () => hideButtons = false); Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs()
{
{ "onExit", () => hideButtons = false },
});
}; };
menu.Get<ButtonWidget>("SETTINGS_BUTTON").OnClick = () => menu.Get<ButtonWidget>("SETTINGS_BUTTON").OnClick = () =>

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

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
widget.Get<ButtonWidget>("MUSIC").OnClick = () => widget.Get<ButtonWidget>("MUSIC").OnClick = () =>
{ {
widget.Visible = false; widget.Visible = false;
MusicPlayerLogic.OpenWindow(world, () => { widget.Visible = true; }); Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs { { "onExit", () => { widget.Visible = true; } } });
}; };
widget.Get<ButtonWidget>("RESUME").OnClick = () => onExit(); widget.Get<ButtonWidget>("RESUME").OnClick = () => onExit();

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

@@ -483,7 +483,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var musicButton = lobby.GetOrNull<ButtonWidget>("MUSIC_BUTTON"); var musicButton = lobby.GetOrNull<ButtonWidget>("MUSIC_BUTTON");
if (musicButton != null) if (musicButton != null)
musicButton.OnClick = () => MusicPlayerLogic.OpenWindow(world); musicButton.OnClick = () => Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs { { "onExit", DoNothing } });
var settingsButton = lobby.GetOrNull<ButtonWidget>("SETTINGS_BUTTON"); var settingsButton = lobby.GetOrNull<ButtonWidget>("SETTINGS_BUTTON");
if (settingsButton != null) if (settingsButton != null)

5
OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs
View File

@@ -110,7 +110,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
extrasMenu.Get<ButtonWidget>("MUSIC_BUTTON").OnClick = () => extrasMenu.Get<ButtonWidget>("MUSIC_BUTTON").OnClick = () =>
{ {
menuType = MenuType.None; menuType = MenuType.None;
MusicPlayerLogic.OpenWindow(world, () => menuType = MenuType.Extras); Ui.OpenWindow("MUSIC_PANEL", new WidgetArgs
{
{ "onExit", () => menuType = MenuType.Extras },
});
}; };
var assetBrowserButton = extrasMenu.GetOrNull<ButtonWidget>("ASSETBROWSER_BUTTON"); var assetBrowserButton = extrasMenu.GetOrNull<ButtonWidget>("ASSETBROWSER_BUTTON");

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

@@ -28,17 +28,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
ScrollItemWidget itemTemplate; ScrollItemWidget itemTemplate;
public static Widget OpenWindow(World world, Action onExit = null)
{
return Ui.OpenWindow(
"MUSIC_PANEL",
new WidgetArgs
{
{ "onExit", onExit != null ? onExit : (() => {}) }
}
);
}
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public MusicPlayerLogic(Widget widget, World world, Action onExit) public MusicPlayerLogic(Widget widget, World world, Action onExit)
{ {