Browse Source

Merge pull request #1170 from stewienj/AvalonDock_fix_null_reference_exception

AvalonDock Fixed some null reference exceptions
pull/1181/head
XceedBoucherS 9 years ago
committed by GitHub
parent
commit
6d37f1fee1
  1. 5
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
  2. 6
      ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs

5
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs

@ -62,7 +62,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
{
_model.SelectedContent.IsActive = true;
if (_model?.SelectedContent != null)
{
_model.SelectedContent.IsActive = true;
}
base.OnGotKeyboardFocus(e);
}

6
ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs

@ -204,9 +204,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
_view = new ContentPresenter();
_view.SetBinding(ContentPresenter.ContentProperty, new Binding("Content") { Source = LayoutElement });
_view.SetBinding( ContentPresenter.ContentTemplateProperty, new Binding( "LayoutItemTemplate" ) { Source = LayoutElement.Root.Manager } );
_view.SetBinding( ContentPresenter.ContentTemplateSelectorProperty, new Binding( "LayoutItemTemplateSelector" ) { Source = LayoutElement.Root.Manager } );
LayoutElement.Root.Manager.InternalAddLogicalChild( _view );
_view.SetBinding(ContentPresenter.ContentTemplateProperty, new Binding("LayoutItemTemplate") { Source = LayoutElement?.Root?.Manager});
_view.SetBinding(ContentPresenter.ContentTemplateSelectorProperty, new Binding("LayoutItemTemplateSelector") { Source = LayoutElement?.Root?.Manager });
LayoutElement?.Root?.Manager.InternalAddLogicalChild(_view);
}
return _view;

Loading…
Cancel
Save