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

convert RootWidget prop back to field, now that it has trivial get/set

Browse Source
This commit is contained in:
Chris Forbes
2011-12-13 22:30:51 +13:00
parent dd55c0ad93
commit 83055f0a17
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,13 +19,8 @@ namespace OpenRA.Widgets
{ {
public abstract class Widget public abstract class Widget
{ {
public static Widget RootWidget public static Widget RootWidget = new ContainerWidget();
{
get { return rootWidget; }
set { rootWidget = value; }
}
static Widget rootWidget = new ContainerWidget();
static Stack<Widget> WindowList = new Stack<Widget>(); static Stack<Widget> WindowList = new Stack<Widget>();
public static Widget SelectedWidget; public static Widget SelectedWidget;
public static Widget MouseOverWidget; public static Widget MouseOverWidget;
@@ -35,7 +30,7 @@ namespace OpenRA.Widgets
if (WindowList.Count > 0) if (WindowList.Count > 0)
RootWidget.RemoveChild(WindowList.Pop()); RootWidget.RemoveChild(WindowList.Pop());
if (WindowList.Count > 0) if (WindowList.Count > 0)
rootWidget.AddChild(WindowList.Peek()); RootWidget.AddChild(WindowList.Peek());
} }
public static Widget OpenWindow(string id) public static Widget OpenWindow(string id)
@@ -45,9 +40,9 @@ namespace OpenRA.Widgets
public static Widget OpenWindow(string id, WidgetArgs args) public static Widget OpenWindow(string id, WidgetArgs args)
{ {
var window = Game.modData.WidgetLoader.LoadWidget(args, rootWidget, id); var window = Game.modData.WidgetLoader.LoadWidget(args, RootWidget, id);
if (WindowList.Count > 0) if (WindowList.Count > 0)
rootWidget.RemoveChild(WindowList.Peek()); RootWidget.RemoveChild(WindowList.Peek());
WindowList.Push(window); WindowList.Push(window);
return window; return window;
} }