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

Migrate to System.Lazy.

Browse Source
This commit is contained in:
Paul Chote
2014-03-12 22:48:47 +13:00
parent 67cd0645a4
commit 1b2a90c00c
25 changed files with 87 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Cnc/ProductionQueueFromSelection.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System;
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Mods.RA;
@@ -32,7 +33,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{
this.world = world;
tabsWidget = Lazy.New(() =>
tabsWidget = Exts.Lazy(() =>
Ui.Root.Get<ProductionTabsWidget>(info.ProductionTabsWidget));
}

3
OpenRA.Mods.Cnc/Widgets/ProductionPaletteWidget.cs Executable file → Normal file
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
@@ -65,7 +66,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{
this.World = world;
this.worldRenderer = worldRenderer;
tooltipContainer = Lazy.New(() =>
tooltipContainer = Exts.Lazy(() =>
Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
cantBuild = new Animation("clock");

4
OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
View File

@@ -74,7 +74,7 @@ namespace OpenRA.Mods.Cnc.Widgets
bool rightPressed = false;
Rectangle leftButtonRect;
Rectangle rightButtonRect;
OpenRA.FileFormats.Lazy<ProductionPaletteWidget> paletteWidget;
Lazy<ProductionPaletteWidget> paletteWidget;
string queueGroup;
[ObjectCreator.UseCtor]
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Cnc.Widgets
// Only visible if the production palette has icons to display
IsVisible = () => queueGroup != null && Groups[queueGroup].Tabs.Count > 0;
paletteWidget = Lazy.New(() => Ui.Root.Get<ProductionPaletteWidget>(PaletteWidget));
paletteWidget = Exts.Lazy(() => Ui.Root.Get<ProductionPaletteWidget>(PaletteWidget));
}
public bool SelectNextTab(bool reverse)

3
OpenRA.Mods.Cnc/Widgets/SupportPowersWidget.cs Executable file → Normal file
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
@@ -48,7 +49,7 @@ namespace OpenRA.Mods.Cnc.Widgets
{
this.worldRenderer = worldRenderer;
spm = world.LocalPlayer.PlayerActor.Trait<SupportPowerManager>();
tooltipContainer = Lazy.New(() =>
tooltipContainer = Exts.Lazy(() =>
Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
icon = new Animation("icon");