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

actually remove the rootWidget from Chrome

Browse Source
This commit is contained in:
alzeih
2010-07-21 16:18:45 +12:00
parent 647252b0cb
commit d0b4761e07
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Chrome.cs
View File

@@ -30,26 +30,24 @@ namespace OpenRA
var widgetYaml = m.ChromeLayout.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge); var widgetYaml = m.ChromeLayout.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge);
if (rootWidget == null) if (Widget.RootWidget == null)
{ {
rootWidget = WidgetLoader.LoadWidget( widgetYaml.FirstOrDefault() ); Widget.RootWidget = WidgetLoader.LoadWidget( widgetYaml.FirstOrDefault() );
rootWidget.Initialize(); Widget.RootWidget.Initialize();
rootWidget.InitDelegates(); Widget.RootWidget.InitDelegates();
} }
} }
public static Widget rootWidget = null;
public void Tick(World world) public void Tick(World world)
{ {
rootWidget.Tick(world); Widget.RootWidget.Tick(world);
if (!world.GameHasStarted) return; if (!world.GameHasStarted) return;
if (world.LocalPlayer == null) return; if (world.LocalPlayer == null) return;
++ticksSinceLastMove; ++ticksSinceLastMove;
} }
public void Draw(World world) { rootWidget.Draw(world); shpRenderer.Flush(); rgbaRenderer.Flush(); lineRenderer.Flush(); } public void Draw(World world) { Widget.RootWidget.Draw(world); shpRenderer.Flush(); rgbaRenderer.Flush(); lineRenderer.Flush(); }
public int ticksSinceLastMove = 0; public int ticksSinceLastMove = 0;
public int2 lastMousePos; public int2 lastMousePos;
@@ -58,7 +56,7 @@ namespace OpenRA
if (Widget.SelectedWidget != null && Widget.SelectedWidget.HandleMouseInputOuter(mi)) if (Widget.SelectedWidget != null && Widget.SelectedWidget.HandleMouseInputOuter(mi))
return true; return true;
if (rootWidget.HandleMouseInputOuter(mi)) if (Widget.RootWidget.HandleMouseInputOuter(mi))
return true; return true;
if (mi.Event == MouseInputEvent.Move) if (mi.Event == MouseInputEvent.Move)
@@ -74,7 +72,7 @@ namespace OpenRA
if (Widget.SelectedWidget != null) if (Widget.SelectedWidget != null)
return Widget.SelectedWidget.HandleKeyPressOuter(e); return Widget.SelectedWidget.HandleKeyPressOuter(e);
if (rootWidget.HandleKeyPressOuter(e)) if (Widget.RootWidget.HandleKeyPressOuter(e))
return true; return true;
return false; return false;
} }

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

@@ -47,9 +47,7 @@ namespace OpenRA.Widgets
public Widget() { IsVisible = () => Visible; } public Widget() { IsVisible = () => Visible; }
public static Widget RootWidget { public static Widget RootWidget = null;
get { return Chrome.rootWidget; }
}
public Widget(Widget widget) public Widget(Widget widget)
{ {