Fixed

DocManager.Layout Properties null after Layout load: LeftSide, TopSide, BottomSide, RightSide null bug after loading layout.
Dirkster99 · Dec 10, 2017 · 06b9682 · 06b9682
1 parent 5b1a8ac
commit 06b9682
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs b/source/Components/Xceed.Wpf.AvalonDock/DockingManager.cs
@@ -333,12 +333,6 @@ void DockingManager_Unloaded(object sender, RoutedEventArgs e)
 
         internal UIElement CreateUIElementForModel(ILayoutElement model)
         {
-            // DEBUG XXX
-            if (model == Layout.LeftSide)
-            {
-                Console.WriteLine("XXX DEBUG XXX");
-            }
-
             if (model is LayoutPanel)
                 return new LayoutPanelControl(model as LayoutPanel);
             if (model is LayoutAnchorablePaneGroup)

diff --git a/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/source/Components/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
@@ -696,24 +696,31 @@ public void ReadXml( XmlReader reader )
             TopSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
             reader.Read();
           }
+          else TopSide = new LayoutAnchorSide();
+
           RightSide = ( LayoutAnchorSide )ReadElement( reader );
           if( RightSide != null )
           {
             RightSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
             reader.Read();
           }
+          else RightSide  = new LayoutAnchorSide();
+
           LeftSide = ( LayoutAnchorSide )ReadElement( reader );
           if( LeftSide != null )
           {
             LeftSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
             reader.Read();
           }
+          else LeftSide  = new LayoutAnchorSide();
+
           BottomSide = ( LayoutAnchorSide )ReadElement( reader );
           if( BottomSide != null )
           {
             BottomSide.Children.Add( ( LayoutAnchorGroup )ReadElement( reader ) );
             reader.Read();
           }
+          else BottomSide  = new LayoutAnchorSide();
 
           FloatingWindows.Clear();
           var floatingWindows = ReadElementList( reader );