From 74155812d057cc18dace4e4ca114fc2a18cc6e6d Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 31 Jul 2010 14:21:09 +1200 Subject: [PATCH] don't merge yaml in chrome; just load sequentially --- OpenRA.Game/Widgets/Widget.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs index 94a7be0441..4576bc3f2f 100644 --- a/OpenRA.Game/Widgets/Widget.cs +++ b/OpenRA.Game/Widgets/Widget.cs @@ -53,11 +53,10 @@ namespace OpenRA.Widgets { if (rootWidget == null) { - var widgetYaml = Game.Manifest.ChromeLayout.Select(a => MiniYaml.FromFile(a)).Aggregate(MiniYaml.Merge); - rootWidget = new ContainerWidget(); - foreach( var w in widgetYaml ) - rootWidget.AddChild( WidgetLoader.LoadWidget( w ) ); + foreach( var file in Game.Manifest.ChromeLayout.Select( a => MiniYaml.FromFile( a ) ) ) + foreach( var w in file ) + rootWidget.AddChild( WidgetLoader.LoadWidget( w ) ); rootWidget.Initialize(); rootWidget.InitDelegates();