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

Remove unused InitDelegates() method. Don't mutate the Children list directly.

Browse Source
This commit is contained in:
Paul Chote
2011-01-23 10:13:14 +13:00
parent 3fe549d0a4
commit 646863b85b
6 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Widgets/Widget.cs
View File

@@ -28,13 +28,13 @@ namespace OpenRA.Widgets
public string Delegate = null;
public string EventHandler = null;
public bool Visible = true;
public readonly List<Widget> Children = new List<Widget>();
// Calculated internally
public Rectangle Bounds;
public Widget Parent = null;
static List<string> Delegates = new List<string>();
public static Stack<Widget> WindowList = new Stack<Widget>();
// Common Funcs that most widgets will want
@@ -121,22 +121,16 @@ namespace OpenRA.Widgets
height);
}
public void PostInit( Dictionary<string, object> args )
public void PostInit(Dictionary<string, object> args)
{
if( Delegate != null )
{
args[ "widget" ] = this;
Game.modData.ObjectCreator.CreateObject<IWidgetDelegate>( Delegate, args );
args.Remove( "widget" );
args["widget"] = this;
Game.modData.ObjectCreator.CreateObject<IWidgetDelegate>(Delegate, args);
args.Remove("widget");
}
}
public void InitDelegates()
{
foreach(var d in Delegates)
Game.CreateObject<IWidgetDelegate>(d);
}
public virtual Rectangle EventBounds { get { return RenderBounds; } }
public virtual Rectangle GetEventBounds()
{
@@ -290,6 +284,8 @@ namespace OpenRA.Widgets
child.Parent = this;
Children.Add( child );
}
public virtual void RemoveChild(Widget child) { Children.Remove(child); }
public virtual void RemoveChildren() { Children.Clear(); }
public Widget GetWidget(string id)
{