V4.0.0 Released

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -25,8 +26,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
   {
     public override Uri GetResourceUri()
     {
+      string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Aero";
+
+
       return new Uri(
-                "/Xceed.Wpf.AvalonDock.Themes.Aero;component/Theme.xaml", 
+          "/" + assemblyName + ";component/Theme.xaml",
           UriKind.Relative );
     }
   }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml

@@ -2,10 +2,11 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -30,7 +31,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2019" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )]
 
 
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml

@@ -2,10 +2,11 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -16,15 +17,13 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+                    xmlns:shell="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDock="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockControls="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
-                    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
                     xmlns:avalonDockAero="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
                     xmlns:avalonDockThemeControls="clr-namespace:Xceed.Wpf.AvalonDock.Themes.Controls"
-                    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockConverters="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock">
+                    xmlns:avalonDockProperties="http://schemas.xceed.com/wpf/xaml/avalondock">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="Brushes.xaml" />
@@ -43,6 +42,10 @@
     <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
   </DataTemplate>
 
+  <DataTemplate x:Key="AnchorablePaneControlContentTemplate">
+    <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+  </DataTemplate>
+
   <!--DocumentPaneControlStyle-->
   <Style x:Key="AvalonDock_ThemeAero_DocumentPaneControlStyle"
          TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
@@ -76,7 +79,8 @@
                                                        IsItemsHost="true"
                                                        Margin="4,0,16,0"
                                                        Grid.Row="0"
-                                                       KeyboardNavigation.TabIndex="1" />
+                                                       KeyboardNavigation.TabIndex="1"
+                                                       KeyboardNavigation.DirectionalNavigation="Cycle"/>
               <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
                                                  Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
                                                  Focusable="False"
@@ -127,6 +131,7 @@
                         CornerRadius="2">
                   <ContentPresenter x:Name="PART_SelectedContentHost"
                                     ContentSource="SelectedContent"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                 </Border>
               </Border>
@@ -206,8 +211,7 @@
                           BorderThickness="0,1,1,0"
                           CornerRadius="0,2,0,0">
                     <Border x:Name="BdInternal"
-                            Background="{TemplateBinding Background}"
+                            Background="{TemplateBinding Background}">
-                            Padding="{TemplateBinding Padding}">
                       <ContentPresenter x:Name="Content"
                                         ContentSource="Header"
                                         HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
@@ -320,6 +324,7 @@
                     KeyboardNavigation.TabNavigation="Cycle">
               <ContentPresenter x:Name="PART_SelectedContentHost"
                                 ContentSource="SelectedContent"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Margin="{TemplateBinding Padding}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
             </Border>
@@ -328,6 +333,7 @@
                                                        IsItemsHost="true"
                                                        Grid.Row="1"
                                                        KeyboardNavigation.TabIndex="1"
+                                                       KeyboardNavigation.DirectionalNavigation="Cycle"
                                                        Panel.ZIndex="1" />
           </Grid>
           <ControlTemplate.Triggers>
@@ -369,8 +375,7 @@
                   <Border x:Name="Bd"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="1,0,1,1"
-                          Background="{TemplateBinding Background}"
+                          Background="{TemplateBinding Background}">
-                          Padding="{TemplateBinding Padding}">
                     <ContentPresenter x:Name="Content"
                                       ContentSource="Header"
                                       HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
@@ -437,13 +442,9 @@
       </Setter.Value>
     </Setter>
 
-    <Setter Property="ContentTemplate">
+    <Setter Property="ContentTemplate"
-      <Setter.Value>
+            Value="{StaticResource AnchorablePaneControlContentTemplate}" />
-        <DataTemplate>
+
-          <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
-        </DataTemplate>
-      </Setter.Value>
-    </Setter>
   </Style>
 
   <Style TargetType="avalonDockControls:AnchorablePaneTitle">
@@ -613,8 +614,8 @@
             Margin="0,4,0,0"
             Padding="2">
       <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                        ContentTemplate="{Binding Model.Root.Manager.AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                        ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
     </Border>
     <ControlTemplate.Triggers>
       <Trigger Property="Side"
@@ -1157,11 +1158,14 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+          <!--Use a transparent background to hit for contextMenu popup-->
           <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
-                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent">
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}">
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Margin="{Binding Padding, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}">
               <Grid>
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
@@ -1171,8 +1175,8 @@
                 <Border Grid.ColumnSpan="3"
                         Background="Transparent" />
                 <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                  ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplate="{Binding Root.Manager.DocumentHeaderTemplate, Mode=OneWay}"
-                                  ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                                  ContentTemplateSelector="{Binding Root.Manager.DocumentHeaderTemplateSelector, Mode=OneWay}" />
                 <!-- Close button should be moved out to the container style -->
                 <Button x:Name="DocumentCloseButton"
                         Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
@@ -1233,19 +1237,18 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+          <!--Use a transparent background to hit for contextMenu popup-->
           <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
-                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent">
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}">
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Margin="{Binding Padding, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}">
               <Grid>
                 <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                  ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplate="{Binding Root.Manager.AnchorableHeaderTemplate, Mode=OneWay}"
-                                  ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                                  ContentTemplateSelector="{Binding Root.Manager.AnchorableHeaderTemplateSelector, Mode=OneWay}" />
-                <avalonDockControls:DropDownControlArea Grid.Column="0"
-                                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" >
-                </avalonDockControls:DropDownControlArea>
               </Grid>
             </Border>
           </avalonDockControls:DropDownControlArea>
@@ -1322,6 +1325,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+          <AdornerDecorator>
             <Grid>
               <Border x:Name="WindowBorder"
                       BorderThickness="{TemplateBinding BorderThickness}"
@@ -1416,6 +1420,7 @@
                 </Grid>
               </Border>
             </Grid>
+          </AdornerDecorator>
           <ControlTemplate.Triggers>
             <Trigger Property="WindowState"
                      Value="Maximized">
@@ -1496,6 +1501,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+          <AdornerDecorator>
             <Grid>
               <Border x:Name="WindowBorder"
                       BorderThickness="{TemplateBinding BorderThickness}"
@@ -1606,6 +1612,7 @@
                 </Grid>
               </Border>
             </Grid>
+          </AdornerDecorator>
           <ControlTemplate.Triggers>
             <Trigger Property="WindowState"
                      Value="Maximized">

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml

@@ -2,10 +2,11 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -25,8 +26,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
   {
     public override Uri GetResourceUri()
     {
+      string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Metro";
+
+
       return new Uri(
-                "/Xceed.Wpf.AvalonDock.Themes.Metro;component/Theme.xaml", 
+          "/" + assemblyName + ";component/Theme.xaml",
           UriKind.Relative );
     }
   }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -30,7 +31,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2019" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )]
 
 
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml

@@ -2,10 +2,11 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -16,13 +17,11 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+                    xmlns:shell="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDock="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockControls="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockConverters="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockProperties="http://schemas.xceed.com/wpf/xaml/avalondock">
-                    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
-                    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="Brushes.xaml" />
@@ -41,6 +40,10 @@
     <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
   </DataTemplate>
 
+  <DataTemplate x:Key="AnchorablePaneControlContentTemplate">
+    <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+  </DataTemplate>
+
   <Style x:Key="AvalonDock_ThemeMetro_ToolButtonStyle"
          TargetType="ToggleButton">
     <Setter Property="Background"
@@ -116,7 +119,8 @@
                                                        IsItemsHost="true"
                                                        Margin="2,0,2,0"
                                                        Grid.Row="0"
-                                                       KeyboardNavigation.TabIndex="1" />
+                                                       KeyboardNavigation.TabIndex="1"
+                                                       KeyboardNavigation.DirectionalNavigation="Cycle" />
               <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
                                                  Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
                                                  Focusable="False"
@@ -159,6 +163,7 @@
                     Padding="0,1,0,2">
               <ContentPresenter x:Name="PART_SelectedContentHost"
                                 ContentSource="SelectedContent"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Margin="0,2,0,2"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
             </Border>
@@ -224,8 +229,7 @@
                   <Border x:Name="Bd"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="0,3,0,0"
-                          Background="{TemplateBinding Background}"
+                          Background="{TemplateBinding Background}">
-                          Padding="{TemplateBinding Padding}">
                   </Border>
                   <ContentPresenter x:Name="Content"
                                     Margin="2"
@@ -330,6 +334,7 @@
                     KeyboardNavigation.TabNavigation="Cycle">
               <ContentPresenter x:Name="PART_SelectedContentHost"
                                 ContentSource="SelectedContent"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Margin="{TemplateBinding Padding}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
             </Border>
@@ -338,6 +343,7 @@
                                                        IsItemsHost="true"
                                                        Grid.Row="1"
                                                        KeyboardNavigation.TabIndex="1"
+                                                       KeyboardNavigation.DirectionalNavigation="Cycle"
                                                        Panel.ZIndex="1" />
           </Grid>
           <ControlTemplate.Triggers>
@@ -378,8 +384,7 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           Margin="4"
                           BorderThickness="0,2,0,0"
-                          Background="{TemplateBinding Background}"
+                          Background="{TemplateBinding Background}">
-                          Padding="{TemplateBinding Padding}">
                     <ContentPresenter x:Name="Content"
                                       ContentSource="Header"
                                       HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
@@ -446,13 +451,9 @@
       </Setter.Value>
     </Setter>
 
-    <Setter Property="ContentTemplate">
+    <Setter Property="ContentTemplate"
-      <Setter.Value>
+            Value="{StaticResource AnchorablePaneControlContentTemplate}" />
-        <DataTemplate>
+
-          <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
-        </DataTemplate>
-      </Setter.Value>
-    </Setter>
   </Style>
 
   <Style TargetType="avalonDockControls:AnchorablePaneTitle">
@@ -633,8 +634,8 @@
             Padding="2">
       <ContentPresenter TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
                         Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                        ContentTemplate="{Binding Model.Root.Manager.AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                        ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
     </Border>
     <ControlTemplate.Triggers>
       <Trigger Property="Side"
@@ -1180,12 +1181,15 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+          <!--Use a transparent background to hit for contextMenu popup-->
           <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
-                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent">
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    Padding="0,2,0,1">
+                    Padding="0,2,0,1"
+                    Margin="{Binding Padding, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}">
               <Grid>
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
@@ -1195,8 +1199,8 @@
                 <Border Grid.ColumnSpan="3"
                         Background="Transparent" />
                 <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                  ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplate="{Binding Root.Manager.DocumentHeaderTemplate, Mode=OneWay}"
-                                  ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                                  ContentTemplateSelector="{Binding Root.Manager.DocumentHeaderTemplateSelector, Mode=OneWay}" />
                 <!-- Close button should be moved out to the container style -->
                 <Button x:Name="DocumentCloseButton"
                         Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
@@ -1277,19 +1281,18 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+          <!--Use a transparent background to hit for contextMenu popup-->
           <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
-                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent">
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}">
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Margin="{Binding Padding, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}">
               <Grid>
                 <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                  ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplate="{Binding Root.Manager.AnchorableHeaderTemplate, Mode=OneWay}"
-                                  ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                                  ContentTemplateSelector="{Binding Root.Manager.AnchorableHeaderTemplateSelector, Mode=OneWay}" />
-                <avalonDockControls:DropDownControlArea Grid.Column="0"
-                                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" >
-                </avalonDockControls:DropDownControlArea>
               </Grid>
             </Border>
           </avalonDockControls:DropDownControlArea>
@@ -1365,6 +1368,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+          <AdornerDecorator>
             <Grid>
               <Border x:Name="WindowBorder"
                       Background="{TemplateBinding Background}"
@@ -1471,6 +1475,7 @@
                 </Grid>
               </Border>
             </Grid>
+          </AdornerDecorator>
           <ControlTemplate.Triggers>
             <Trigger Property="WindowState"
                      Value="Maximized">
@@ -1553,6 +1558,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+          <AdornerDecorator>
             <Grid>
               <Border x:Name="WindowBorder"
                       BorderThickness="{TemplateBinding BorderThickness}"
@@ -1663,6 +1669,7 @@
                 </Grid>
               </Border>
             </Grid>
+          </AdornerDecorator>
           <ControlTemplate.Triggers>
             <Trigger Property="WindowState"
                      Value="Maximized">

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml

@@ -2,10 +2,11 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -30,7 +31,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2019" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2020" )]
 
 
 // Setting ComVisible to false makes the types in this assembly not visible 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml

@@ -2,10 +2,11 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -17,12 +18,12 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
-                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:shell="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDock="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockLayout="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockControls="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockConverters="http://schemas.xceed.com/wpf/xaml/avalondock"
-                    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock">
+                    xmlns:avalonDockProperties="http://schemas.xceed.com/wpf/xaml/avalondock">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="Brushes.xaml" />
@@ -41,6 +42,10 @@
     <avalonDockControls:LayoutDocumentControl Model="{Binding}" />
   </DataTemplate>
 
+  <DataTemplate x:Key="AnchorablePaneControlContentTemplate">
+    <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
+  </DataTemplate>
+
 
   <Style x:Key="AvalonDock_ThemeVS2010_ToolButtonStyle"
          TargetType="ToggleButton">
@@ -146,7 +151,8 @@
                                                        IsItemsHost="true"
                                                        Margin="2,0,2,0"
                                                        Grid.Row="0"
-                                                       KeyboardNavigation.TabIndex="1" />
+                                                       KeyboardNavigation.TabIndex="1"
+                                                       KeyboardNavigation.DirectionalNavigation="Cycle" />
               <avalonDockControls:DropDownButton x:Name="MenuDropDownButton"
                                                  Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
                                                  Focusable="False"
@@ -190,6 +196,7 @@
                     Padding="0,1,0,2">
               <ContentPresenter x:Name="PART_SelectedContentHost"
                                 ContentSource="SelectedContent"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Margin="0,2,0,2"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
             </Border>
@@ -275,8 +282,7 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="1,1,1,0"
                           CornerRadius="2,2,0,0"
-                          Background="{TemplateBinding Background}"
+                          Background="{TemplateBinding Background}">
-                          Padding="{TemplateBinding Padding}">
                     <ContentPresenter x:Name="Content"
                                       ContentSource="Header"
                                       HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
@@ -411,6 +417,7 @@
                     KeyboardNavigation.TabNavigation="Cycle">
               <ContentPresenter x:Name="PART_SelectedContentHost"
                                 ContentSource="SelectedContent"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                 Margin="{TemplateBinding Padding}"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
             </Border>
@@ -419,6 +426,7 @@
                                                        IsItemsHost="true"
                                                        Grid.Row="1"
                                                        KeyboardNavigation.TabIndex="1"
+                                                       KeyboardNavigation.DirectionalNavigation="Cycle"
                                                        Panel.ZIndex="1" />
           </Grid>
           <ControlTemplate.Triggers>
@@ -459,8 +467,7 @@
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="1,0,1,1"
                           CornerRadius="0,0,2,2"
-                          Background="{TemplateBinding Background}"
+                          Background="{TemplateBinding Background}">
-                          Padding="{TemplateBinding Padding}">
                     <ContentPresenter x:Name="Content"
                                       ContentSource="Header"
                                       HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
@@ -532,13 +539,9 @@
       </Setter.Value>
     </Setter>
 
-    <Setter Property="ContentTemplate">
+    <Setter Property="ContentTemplate"
-      <Setter.Value>
+            Value="{StaticResource AnchorablePaneControlContentTemplate}" />
-        <DataTemplate>
+
-          <avalonDockControls:LayoutAnchorableControl Model="{Binding}" />
-        </DataTemplate>
-      </Setter.Value>
-    </Setter>
   </Style>
 
   <Style TargetType="avalonDockControls:AnchorablePaneTitle">
@@ -722,8 +725,8 @@
             Padding="2">
       <ContentPresenter TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
                         Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                        ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                        ContentTemplate="{Binding Model.Root.Manager.AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
-                        ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                        ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
     </Border>
     <ControlTemplate.Triggers>
       <Trigger Property="Side"
@@ -1274,12 +1277,14 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+          <!--Use a transparent background to hit for contextMenu popup-->
           <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
-                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent">
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    Padding="0,2,0,1">
+                    Margin="{Binding Padding, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}">
               <Grid>
                 <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="*" />
@@ -1289,8 +1294,8 @@
                 <Border Grid.ColumnSpan="3"
                         Background="Transparent" />
                 <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                  ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplate="{Binding Root.Manager.DocumentHeaderTemplate, Mode=OneWay}"
-                                  ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                                  ContentTemplateSelector="{Binding Root.Manager.DocumentHeaderTemplateSelector, Mode=OneWay}" />
                 <!-- Close button should be moved out to the container style -->
                 <Button x:Name="DocumentCloseButton"
                         Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
@@ -1371,19 +1376,18 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+          <!--Use a transparent background to hit for contextMenu popup-->
           <avalonDockControls:DropDownControlArea DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
-                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                  DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  Background="Transparent">
             <Border Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}">
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Margin="{Binding Padding, RelativeSource={RelativeSource AncestorType={x:Type TabItem}}}">
               <Grid>
                 <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"
-                                  ContentTemplate="{Binding AnchorableHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                  ContentTemplate="{Binding Root.Manager.AnchorableHeaderTemplate, Mode=OneWay}"
-                                  ContentTemplateSelector="{Binding AnchorableHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" />
+                                  ContentTemplateSelector="{Binding Root.Manager.AnchorableHeaderTemplateSelector, Mode=OneWay}" />
-                <avalonDockControls:DropDownControlArea Grid.Column="0"
-                                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        DropDownContextMenuDataContext="{Binding Path=Model, RelativeSource={RelativeSource TemplatedParent}}" >
-                </avalonDockControls:DropDownControlArea>
               </Grid>
             </Border>
           </avalonDockControls:DropDownControlArea>
@@ -1463,6 +1467,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+          <AdornerDecorator>
             <Grid>
               <Border x:Name="WindowBorder"
                       BorderThickness="{TemplateBinding BorderThickness}"
@@ -1557,6 +1562,7 @@
                 </Grid>
               </Border>
             </Grid>
+          </AdornerDecorator>
           <ControlTemplate.Triggers>
             <Trigger Property="WindowState"
                      Value="Maximized">
@@ -1687,6 +1693,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+          <AdornerDecorator>
             <Grid>
               <Border x:Name="WindowBorder"
                       BorderThickness="{TemplateBinding BorderThickness}"
@@ -1798,6 +1805,7 @@
                 </Grid>
               </Border>
             </Grid>
+          </AdornerDecorator>
           <ControlTemplate.Triggers>
             <Trigger Property="WindowState"
                      Value="Maximized">

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -25,8 +26,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
   {
     public override Uri GetResourceUri()
     {
+      string assemblyName = "Xceed.Wpf.AvalonDock.Themes.VS2010";
+
+
       return new Uri(
-                "/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Theme.xaml", 
+                "/" + assemblyName + ";component/Theme.xaml",
                 UriKind.Relative );
     }
   }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -37,8 +38,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override Size MeasureOverride( Size availableSize )
     {
-      var visibleChildren = Children.Cast<UIElement>().Where( ch => ch.Visibility != System.Windows.Visibility.Collapsed );
-
       Size desideredSize = new Size();
       foreach( FrameworkElement child in Children )
       {
@@ -58,10 +57,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
       var skipAllOthers = false;
       foreach( TabItem doc in visibleChildren )
       {
-        var layoutContent = doc.Content as LayoutContent;
         if( skipAllOthers || offset + doc.DesiredSize.Width > finalSize.Width )
         {
-          if( layoutContent.IsSelected && !doc.IsVisible )
+          var layoutContent = doc.Content as LayoutContent;
+          if( (layoutContent != null) && layoutContent.IsSelected && !doc.IsVisible )
           {
             var parentContainer = layoutContent.Parent as ILayoutContainer;
             var parentSelector = layoutContent.Parent as ILayoutContentSelector;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -108,6 +109,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           DropDownContextMenu.PlacementTarget = null;
           DropDownContextMenu.Placement = PlacementMode.MousePoint;
+          DropDownContextMenu.HorizontalOffset = 0d;
+          DropDownContextMenu.VerticalOffset = 0d;
           DropDownContextMenu.DataContext = DropDownContextMenuDataContext;
           DropDownContextMenu.IsOpen = true;
           // e.Handled = true;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -21,6 +22,7 @@ using System.Windows;
 using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Threading;
+using System.Windows.Input;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -114,6 +116,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         Dispatcher.BeginInvoke( new Action( () =>
             {
+              if( ( currentActiveContent.Root != null ) && ( currentActiveContent.Root.Manager != null ) )
+              {
+                currentActiveContent.Root.Manager.MoveFocus( new TraversalRequest( FocusNavigationDirection.Next ) );
+              }
               currentActiveContent.IsSelected = false;
               currentActiveContent.IsActive = false;
               currentActiveContent.IsActive = true;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -151,9 +152,13 @@ namespace Xceed.Wpf.AvalonDock.Controls
     #region Overrides
 
     protected override void OnGotKeyboardFocus( System.Windows.Input.KeyboardFocusChangedEventArgs e )
+    {
+      var setIsActive = !( ( e.NewFocus != null ) && ( e.OldFocus != null ) && ( e.OldFocus is LayoutFloatingWindowControl ) );
+      if( setIsActive )
       {
         if( Model != null )
           Model.IsActive = true;
+      }      
 
       base.OnGotKeyboardFocus( e );
     }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -136,12 +137,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void OnClosed( EventArgs e )
     {
-      var root = Model.Root;
-      if( root != null )
-      {
-        root.Manager.RemoveFloatingWindow( this );
-        root.CollectGarbage();
-      }
       if( _overlayWindow != null )
       {
         _overlayWindow.Close();
@@ -150,28 +145,12 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
       base.OnClosed( e );      
 
-      if( !CloseInitiatedByUser && (root != null) )
-      {
-        root.FloatingWindows.Remove( _model );
-      }
-
       _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged );      
       IsVisibleChanged -= this.LayoutAnchorableFloatingWindowControl_IsVisibleChanged;
       BindingOperations.ClearBinding( this, VisibilityProperty );
       BindingOperations.ClearBinding( this, SingleContentLayoutItemProperty );
     }
 
-    protected override void OnClosing( System.ComponentModel.CancelEventArgs e )
-    {
-      if( CloseInitiatedByUser && !KeepContentVisibleOnClose )
-      {
-        e.Cancel = true;
-        _model.Descendents().OfType<LayoutAnchorable>().ToArray().ForEach<LayoutAnchorable>( ( a ) => a.Hide() );
-      }
-
-      base.OnClosing( e );
-    }
-
     protected override IntPtr FilterMessage( IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled )
     {
       switch( msg )
@@ -211,6 +190,75 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
     }
 
+    protected override bool CanClose( object parameter = null )
+    {
+      if( this.Model == null )
+        return false;
+
+      var root = this.Model.Root;
+      if( root == null )
+        return false;
+
+      var manager = root.Manager;
+      if( manager == null )
+        return false;
+
+      foreach( var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray() )
+      {
+        if( !anchorable.CanClose )
+        {
+          return false;
+        }
+
+        var anchorableLayoutItem = manager.GetLayoutItemFromModel( anchorable ) as LayoutAnchorableItem;
+        if( anchorableLayoutItem == null ||
+            anchorableLayoutItem.CloseCommand == null ||
+            !anchorableLayoutItem.CloseCommand.CanExecute( parameter ) )
+        {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    protected override bool CanHide( object parameter = null )
+    {
+      if( this.Model == null )
+        return false;
+
+      var root = this.Model.Root;
+      if( root == null )
+        return false;
+
+      var manager = root.Manager;
+      if( manager == null )
+        return false;
+
+      foreach( var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray() )
+      {
+        if( !anchorable.CanHide )
+        {
+          return false;
+        }
+
+        var anchorableLayoutItem = manager.GetLayoutItemFromModel( anchorable ) as LayoutAnchorableItem;
+        if( anchorableLayoutItem == null ||
+            anchorableLayoutItem.HideCommand == null ||
+            !anchorableLayoutItem.HideCommand.CanExecute( parameter ) )
+        {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    protected override void DoHide()
+    {
+      this.OnExecuteHideWindowCommand( null );
+    }
+
     #endregion
 
     #region Private Methods
@@ -288,39 +336,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private bool CanExecuteHideWindowCommand( object parameter )
     {
-      if( Model == null )
+      return this.CanHide( parameter );     
-        return false;
-
-      var root = Model.Root;
-      if( root == null )
-        return false;
-
-      var manager = root.Manager;
-      if( manager == null )
-        return false;
-
-      bool canExecute = false;
-      foreach( var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray() )
-      {
-        if( !anchorable.CanHide )
-        {
-          canExecute = false;
-          break;
-        }
-
-        var anchorableLayoutItem = manager.GetLayoutItemFromModel( anchorable ) as LayoutAnchorableItem;
-        if( anchorableLayoutItem == null ||
-            anchorableLayoutItem.HideCommand == null ||
-            !anchorableLayoutItem.HideCommand.CanExecute( parameter ) )
-        {
-          canExecute = false;
-          break;
-        }
-
-        canExecute = true;
-      }
-
-      return canExecute;
     }
 
     private void OnExecuteHideWindowCommand( object parameter )
@@ -343,39 +359,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private bool CanExecuteCloseWindowCommand( object parameter )
     {
-      if( Model == null )
+      return this.CanClose( parameter );
-        return false;
-
-      var root = Model.Root;
-      if( root == null )
-        return false;
-
-      var manager = root.Manager;
-      if( manager == null )
-        return false;
-
-      bool canExecute = false;
-      foreach( var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray() )
-      {
-        if( !anchorable.CanClose )
-        {
-          canExecute = false;
-          break;
-        }
-
-        var anchorableLayoutItem = manager.GetLayoutItemFromModel( anchorable ) as LayoutAnchorableItem;
-        if( anchorableLayoutItem == null ||
-            anchorableLayoutItem.CloseCommand == null ||
-            !anchorableLayoutItem.CloseCommand.CanExecute( parameter ) )
-        {
-          canExecute = false;
-          break;
-        }
-
-        canExecute = true;
-      }
-
-      return canExecute;
     }
 
     private void OnExecuteCloseWindowCommand( object parameter )
@@ -437,7 +421,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       if( draggingWindow.Model is LayoutDocumentFloatingWindow )
         return _dropAreas;
 
-      var rootVisual = ( Content as FloatingWindowContentHost ).RootVisual;
+      var rootVisual = this.Content as System.Windows.Media.Visual;
 
       foreach( var areaHost in rootVisual.FindVisualChildren<LayoutAnchorablePaneControl>() )
       {

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -288,6 +289,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
       _anchorable = model as LayoutAnchorable;
       _anchorable.IsVisibleChanged += new EventHandler( _anchorable_IsVisibleChanged );
 
+      if( _anchorable.CanClose )
+      {
+        _anchorable.SetCanCloseInternal( true );
+      }
+
       base.Attach( model );
     }
 
@@ -340,11 +346,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
     protected override void SetDefaultBindings()
     {
       if( HideCommand == null )
-        HideCommand = _defaultHideCommand;
+        this.SetCurrentValue( LayoutAnchorableItem.HideCommandProperty, _defaultHideCommand );
       if( AutoHideCommand == null )
-        AutoHideCommand = _defaultAutoHideCommand;
+        this.SetCurrentValue( LayoutAnchorableItem.AutoHideCommandProperty, _defaultAutoHideCommand );
       if( DockCommand == null )
-        DockCommand = _defaultDockCommand;
+        this.SetCurrentValue( LayoutAnchorableItem.DockCommandProperty, _defaultDockCommand );
 
       Visibility = _anchorable.IsVisible ? Visibility.Visible : System.Windows.Visibility.Hidden;
       base.SetDefaultBindings();

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

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -19,10 +20,11 @@ using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-  public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
+  public class LayoutAnchorablePaneControl : LayoutCachePaneControl, ILayoutControl//, ILogicalChildrenContainer
   {
     #region Members
 
@@ -80,21 +82,31 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       base.OnMouseLeftButtonDown( e );
 
+      var parentDockingManager = ((Visual)e.OriginalSource).FindVisualAncestor<DockingManager>();
+      if ((this.Model != null) && (this.Model.Root != null) && (this.Model.Root.Manager != null)
+          && this.Model.Root.Manager.Equals(parentDockingManager))
+      {
         if (!e.Handled && (_model != null) && (_model.SelectedContent != null) )
         {
            _model.SelectedContent.IsActive = true;
         }
       }
+    }
 
     protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e )
     {
       base.OnMouseRightButtonDown( e );
 
+      var parentDockingManager = ((Visual)e.OriginalSource).FindVisualAncestor<DockingManager>();
+      if ((this.Model != null) && (this.Model.Root != null) && (this.Model.Root.Manager != null)
+          && this.Model.Root.Manager.Equals(parentDockingManager))
+      {
         if (!e.Handled && (_model != null) && (_model.SelectedContent != null))
         {
           _model.SelectedContent.IsActive = true;
         }
       }
+    }
 
 
     #endregion

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs

@@ -0,0 +1,103 @@
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2020 Xceed Software Inc.
+
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+  public class LayoutCachePaneControl : TabControl
+  {
+    #region Constructors
+
+    static LayoutCachePaneControl()
+    {
+    }
+
+    #endregion
+
+    #region Properties
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    #endregion
+
+    #region Overrides
+
+    protected override void OnSelectionChanged( SelectionChangedEventArgs e )
+    {
+      if( this.SelectedIndex < 0 )
+        e.Handled = true;
+
+      base.OnSelectionChanged( e );
+    }
+    #endregion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+}

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -21,6 +22,7 @@ using System.Windows.Input;
 using Xceed.Wpf.AvalonDock.Layout;
 using System.Collections;
 using System;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -150,21 +152,35 @@ namespace Xceed.Wpf.AvalonDock.Controls
     #region Overrides
 
     protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      var setIsActive = !( (e.NewFocus != null) && (e.OldFocus != null) && (e.OldFocus is LayoutFloatingWindowControl) );
+      if( setIsActive )
       {
         this.SetIsActive();
+      }
       base.OnPreviewGotKeyboardFocus( e );
     }
 
-    protected override void OnMouseLeftButtonDown( MouseButtonEventArgs e )
+    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      var parentDockingManager = ((Visual)e.OriginalSource).FindVisualAncestor<DockingManager>();
+      if ((this.Model != null) && (this.Model.Root != null) && (this.Model.Root.Manager != null)
+          && this.Model.Root.Manager.Equals(parentDockingManager))
       {
         this.SetIsActive();
-      base.OnMouseLeftButtonDown( e );
+      }
+      base.OnPreviewMouseLeftButtonDown( e );
     }
 
-    protected override void OnMouseRightButtonDown( MouseButtonEventArgs e )
+    protected override void OnPreviewMouseRightButtonDown( MouseButtonEventArgs e )
+    {
+      var parentDockingManager = ((Visual)e.OriginalSource).FindVisualAncestor<DockingManager>();
+      if ((this.Model != null) && (this.Model.Root != null) && (this.Model.Root.Manager != null)
+          && this.Model.Root.Manager.Equals(parentDockingManager))
       {
         this.SetIsActive();
-      base.OnMouseLeftButtonDown( e );
+      }
+      base.OnPreviewMouseRightButtonDown( e );
     }
 
 

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -19,6 +20,7 @@ using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows;
 using System.Windows.Controls.Primitives;
 using Microsoft.Windows.Shell;
+using System.Linq;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -121,18 +123,41 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void OnClosed( EventArgs e )
     {
-      var root = Model.Root;
-      root.Manager.RemoveFloatingWindow( this );
-      root.CollectGarbage();
-
       base.OnClosed( e );
 
-      if( !CloseInitiatedByUser )
+      _model.RootDocumentChanged -= new EventHandler( _model_RootDocumentChanged );
+    }
+
+    protected override bool CanClose( object parameter = null )
+    {
+      if( this.Model == null )
+        return false;
+
+      var root = this.Model.Root;
+      if( root == null )
+        return false;
+
+      var manager = root.Manager;
+      if( manager == null )
+        return false;
+
+      foreach( var document in this.Model.Descendents().OfType<LayoutDocument>().ToArray() )
+      {
+        if( !document.CanClose )
         {
-        root.FloatingWindows.Remove( _model );
+          return false;
         }
 
-      _model.RootDocumentChanged -= new EventHandler( _model_RootDocumentChanged );
+        var documentLayoutItem = manager.GetLayoutItemFromModel( document ) as LayoutDocumentItem;
+        if( documentLayoutItem == null ||
+            documentLayoutItem.CloseCommand == null ||
+            !documentLayoutItem.CloseCommand.CanExecute( parameter ) )
+        {
+          return false;
+        }
+      }
+
+      return true;
     }
 
     #endregion

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -20,10 +21,11 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
-  public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
+  public class LayoutDocumentPaneControl : LayoutCachePaneControl, ILayoutControl//, ILogicalChildrenContainer
   {
     #region Members
 
@@ -55,32 +57,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     #region Properties
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     #region Model
 
     public ILayoutElement Model
@@ -117,17 +93,30 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       base.OnMouseLeftButtonDown( e );
 
-      if( !e.Handled && _model.SelectedContent != null )
+      var parentDockingManager = ( ( Visual )e.OriginalSource ).FindVisualAncestor<DockingManager>();
+      if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null )
+          && this.Model.Root.Manager.Equals( parentDockingManager ) )
+      {
+        if( !e.Handled && ( _model != null ) && ( _model.SelectedContent != null ) )
+        {
           _model.SelectedContent.IsActive = true;
         }
+      }
+    }
 
     protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e )
     {
       base.OnMouseRightButtonDown( e );
 
-      if( !e.Handled && _model.SelectedContent != null )
+      var parentDockingManager = ( ( Visual )e.OriginalSource ).FindVisualAncestor<DockingManager>();
+      if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null )
+          && this.Model.Root.Manager.Equals( parentDockingManager ) )
+      {
+        if( !e.Handled && ( _model != null ) && ( _model.SelectedContent != null ) )
+        {
           _model.SelectedContent.IsActive = true;
-
+        }
+      }
     }
 
 
@@ -136,36 +125,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     #region Private Methods
 
     private void OnLayoutUpdated( object sender, EventArgs e )
+    {
+      if( this.IsLoaded )
       {
         var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
         modelWithAtcualSize.ActualWidth = ActualWidth;
         modelWithAtcualSize.ActualHeight = ActualHeight;
       }
+    }
 
     #endregion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -26,6 +27,7 @@ using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Documents;
 using Xceed.Wpf.AvalonDock.Themes;
+using Standard;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -221,13 +223,16 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       if( !_isInternalChange )
       {
-        if( WindowState == WindowState.Maximized )
+        if( this.WindowState == WindowState.Maximized )
         {
-          UpdateMaximizedState( true );
+          this.UpdateMaximizedState( true );
         }
         else
         {
-          WindowState = IsMaximized ? WindowState.Maximized : WindowState.Normal;
+          if( this.IsMaximized )
+          {
+            this.WindowState = WindowState.Maximized;
+          }
         }
       }
 
@@ -240,13 +245,37 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     #region Overrides
 
+    protected override void OnClosing( System.ComponentModel.CancelEventArgs e )
+    {
+      if( this.CloseInitiatedByUser && !this.KeepContentVisibleOnClose )
+      {
+        // model.CanClose is false, can we hide ?
+        if( !this.CanClose() )
+        {
+          // Cancel the closing because we are hiding or nothing to do on (Alt + F4).
+          e.Cancel = true;
+          if( this.CanHide() )
+          {
+            // Just hiding.
+            this.DoHide();
+          }
+        }
+      }
+
+      base.OnClosing( e );
+    }
+
     protected override void OnClosed( EventArgs e )
     {
-      if( Content != null )
+      var root = this.Model.Root;
+      if( root != null )
       {
-        var host = Content as FloatingWindowContentHost;
+        root.Manager.RemoveFloatingWindow( this );
-        host.Dispose();
+        root.CollectGarbage();
+      }
 
+      if( this.Content != null )
+      {
         if( _hwndSrc != null )
         {
           _hwndSrc.RemoveHook( _hwndSrcHook );
@@ -256,6 +285,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
 
       base.OnClosed( e );
+
+      if( !this.CloseInitiatedByUser && ( root != null ) )
+      {
+        root.FloatingWindows.Remove( this.Model as LayoutFloatingWindow );
+      }
     }
 
     protected override void OnInitialized( EventArgs e )
@@ -272,6 +306,30 @@ namespace Xceed.Wpf.AvalonDock.Controls
       base.OnInitialized( e );
     }
 
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      if( Keyboard.IsKeyDown( Key.LeftCtrl ) || Keyboard.IsKeyDown( Key.RightCtrl ) )
+      {
+        if( e.IsDown && e.Key == Key.Tab )
+        {
+          if( ( this.Model != null ) && ( this.Model.Root != null ) )
+          {
+            var manager = this.Model.Root.Manager;
+            if( manager != null )
+            {
+              if( !manager.IsNavigatorWindowActive )
+              {
+                manager.ShowNavigatorWindow();
+                e.Handled = true;
+              }
+            }
+          }
+        }
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
+
 
     #endregion
 
@@ -314,6 +372,20 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
     }
 
+    protected virtual bool CanClose( object parameter = null )
+    {
+      return false;
+    }
+
+    protected virtual bool CanHide( object parameter = null )
+    {
+      return false;
+    }
+
+    protected virtual void DoHide()
+    {
+    }
+
     internal void AttachDrag( bool onActivated = true )
     {
       if( onActivated )
@@ -335,6 +407,34 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
       switch( msg )
       {
+        case Win32Helper.NCCALCSIZE:
+          if( wParam != IntPtr.Zero )
+          {
+            handled = true;
+            var client = (RECT)Marshal.PtrToStructure( lParam, typeof( RECT ) );
+            client.Bottom -= 1;
+            Marshal.StructureToPtr( client, lParam, false );
+          }
+          break;
+
+        //case Win32Helper.WM_NCHITTEST:
+        //  {
+        //    handled = true;
+        //    //var htLocation = DefWindowProc( hwnd, msg, wParam, lParam ).ToInt32();
+        //    //switch( htLocation )
+        //    //{
+        //    //  case (int)HitTestResult.HTBOTTOM:
+        //    //  case (int)HitTestResult.HTBOTTOMLEFT:
+        //    //  case (int)HitTestResult.HTBOTTOMRIGHT:
+        //    //  case (int)HitTestResult.HTLEFT:
+        //    //  case (int)HitTestResult.HTRIGHT:
+        //    //  case (int)HitTestResult.HTTOP:
+        //    //  case (int)HitTestResult.HTTOPLEFT:
+        //    //  case (int)HitTestResult.HTTOPRIGHT:
+        //    //    htLocation = (int)HitTestResult.HTBORDER;
+        //  }
+        //  break;
+
         case Win32Helper.WM_ACTIVATE:
           if( ( (int)wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE )
           {
@@ -413,7 +513,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( lfwc.IsLoaded && lfwc.IsContentImmutable )
           return lfwc.Content;
-        return new FloatingWindowContentHost( sender as LayoutFloatingWindowControl ) { Content = content as UIElement };
+        return content;
       }
       return null;
     }
@@ -507,202 +607,5 @@ namespace Xceed.Wpf.AvalonDock.Controls
     }
 
     #endregion
-
-    #region Internal Classes
-
-    protected internal class FloatingWindowContentHost : HwndHost
-    {
-      #region Members
-
-      private LayoutFloatingWindowControl _owner;
-      private HwndSource _wpfContentHost = null;
-      private Border _rootPresenter = null;
-      private DockingManager _manager = null;
-
-      #endregion
-
-      #region Constructors
-
-      public FloatingWindowContentHost( LayoutFloatingWindowControl owner )
-      {
-        _owner = owner;
-        var manager = _owner.Model.Root.Manager;
-
-        var binding = new Binding( "SizeToContent" ) { Source = _owner };
-        BindingOperations.SetBinding( this, FloatingWindowContentHost.SizeToContentProperty, binding );
-      }
-
-      #endregion
-
-      #region Properties
-
-      #region RootVisual
-
-      public Visual RootVisual
-      {
-        get
-        {
-          return _rootPresenter;
-        }
-      }
-
-      #endregion
-
-      #region Content
-
-      /// <summary>
-      /// Content Dependency Property
-      /// </summary>
-      public static readonly DependencyProperty ContentProperty = DependencyProperty.Register( "Content", typeof( UIElement ), typeof( FloatingWindowContentHost ),
-              new FrameworkPropertyMetadata( ( UIElement )null, new PropertyChangedCallback( OnContentChanged ) ) );
-
-      /// <summary>
-      /// Gets or sets the Content property.  This dependency property 
-      /// indicates ....
-      /// </summary>
-      public UIElement Content
-      {
-        get
-        {
-          return ( UIElement )GetValue( ContentProperty );
-        }
-        set
-        {
-          SetValue( ContentProperty, value );
-        }
-      }
-
-      /// <summary>
-      /// Handles changes to the Content property.
-      /// </summary>
-      private static void OnContentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-      {
-        ( ( FloatingWindowContentHost )d ).OnContentChanged( (UIElement)e.OldValue, (UIElement)e.NewValue );
-      }
-
-      /// <summary>
-      /// Provides derived classes an opportunity to handle changes to the Content property.
-      /// </summary>
-      protected virtual void OnContentChanged( UIElement oldValue, UIElement newValue )
-      {
-        if( _rootPresenter != null )
-          _rootPresenter.Child = Content;
-
-        var oldContent = oldValue as FrameworkElement;
-        if( oldContent != null )
-        {
-          oldContent.SizeChanged -= this.Content_SizeChanged;
-        }
-
-        var newContent = newValue as FrameworkElement;
-        if( newContent != null )
-        {
-          newContent.SizeChanged += this.Content_SizeChanged;
-        }
-      }
-
-      #endregion
-
-      #region SizeToContent
-
-      /// <summary>
-      /// SizeToContent Dependency Property
-      /// </summary>
-      public static readonly DependencyProperty SizeToContentProperty = DependencyProperty.Register( "SizeToContent", typeof( SizeToContent ), typeof( FloatingWindowContentHost ),
-              new FrameworkPropertyMetadata( SizeToContent.Manual, new PropertyChangedCallback( OnSizeToContentChanged ) ) );
-
-      /// <summary>
-      /// Gets or sets the SizeToContent property. 
-      /// </summary>
-      public SizeToContent SizeToContent
-      {
-        get
-        {
-          return (SizeToContent)GetValue( SizeToContentProperty );
-        }
-        set
-        {
-          SetValue( SizeToContentProperty, value );
-        }
-      }
-
-      /// <summary>
-      /// Handles changes to the SizeToContent property.
-      /// </summary>
-      private static void OnSizeToContentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-      {
-        ( (FloatingWindowContentHost)d ).OnSizeToContentChanged( (SizeToContent)e.OldValue, (SizeToContent)e.NewValue );
-      }
-
-      /// <summary>
-      /// Provides derived classes an opportunity to handle changes to the SizeToContent property.
-      /// </summary>
-      protected virtual void OnSizeToContentChanged( SizeToContent oldValue, SizeToContent newValue )
-      {
-        if( _wpfContentHost != null )
-        {
-          _wpfContentHost.SizeToContent = newValue;
-        }
-      }
-
-      #endregion
-
-      #endregion
-
-      #region Overrides
-
-      protected override System.Runtime.InteropServices.HandleRef BuildWindowCore( System.Runtime.InteropServices.HandleRef hwndParent )
-      {
-        _wpfContentHost = new HwndSource( new HwndSourceParameters()
-        {
-          ParentWindow = hwndParent.Handle,
-          WindowStyle = Win32Helper.WS_CHILD | Win32Helper.WS_VISIBLE | Win32Helper.WS_CLIPSIBLINGS | Win32Helper.WS_CLIPCHILDREN,
-          Width = 1,
-          Height = 1
-        } );
-
-        _rootPresenter = new Border() { Child = new AdornerDecorator() { Child = Content }, Focusable = true };
-        _rootPresenter.SetBinding( Border.BackgroundProperty, new Binding( "Background" ) { Source = _owner } );
-        _wpfContentHost.RootVisual = _rootPresenter;
-
-        _manager = _owner.Model.Root.Manager;
-        _manager.InternalAddLogicalChild( _rootPresenter );
-
-        return new HandleRef( this, _wpfContentHost.Handle );
-      }
-
-      protected override void DestroyWindowCore( HandleRef hwnd )
-      {
-        _manager.InternalRemoveLogicalChild( _rootPresenter );
-        if( _wpfContentHost != null )
-        {
-          _wpfContentHost.Dispose();
-          _wpfContentHost = null;
-        }
-      }
-
-      protected override Size MeasureOverride( Size constraint )
-      {
-        if( Content == null )
-          return base.MeasureOverride( constraint );
-
-        Content.Measure( constraint );
-        return Content.DesiredSize;
-      }
-
-      #endregion
-
-      #region Event Handlers
-
-      private void Content_SizeChanged( object sender, SizeChangedEventArgs e )
-      {
-        this.InvalidateMeasure();
-        this.InvalidateArrange();
-      }
-
-      #endregion
-    }
-
-    #endregion
   }
 }

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -413,9 +414,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( prevChildModel.DockWidth.IsStar )
         {
-          var width = prevChildModel.DockWidth.Value * ( prevChildActualSize.Width + delta ) / prevChildActualSize.Width;
+          prevChildModel.DockWidth = new GridLength( prevChildActualSize.Width + delta, GridUnitType.Star );
-          var widthToSet = Math.Max( width, prevChildModel.DockMinWidth );
-          prevChildModel.DockWidth = new GridLength( widthToSet, GridUnitType.Star );
         }
         else
         {
@@ -429,9 +428,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( nextChildModel.DockWidth.IsStar )
           {
-            var width = nextChildModel.DockWidth.Value * ( nextChildActualSize.Width - delta ) / nextChildActualSize.Width;
+            nextChildModel.DockWidth = new GridLength( nextChildActualSize.Width - delta, GridUnitType.Star );
-            var widthToSet = Math.Max( width, nextChildModel.DockMinWidth );
-            nextChildModel.DockWidth = new GridLength( widthToSet, GridUnitType.Star );
           }
           else
           {
@@ -446,9 +443,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( prevChildModel.DockHeight.IsStar )
         {
-          var height = prevChildModel.DockHeight.Value * ( prevChildActualSize.Height + delta ) / prevChildActualSize.Height;
+          prevChildModel.DockHeight = new GridLength( prevChildActualSize.Height + delta, GridUnitType.Star );
-          var heightToSet = Math.Max( height, prevChildModel.DockMinHeight );
-          prevChildModel.DockHeight = new GridLength( heightToSet, GridUnitType.Star );
         }
         else
         {
@@ -462,9 +457,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( nextChildModel.DockHeight.IsStar )
           {
-            var height = nextChildModel.DockHeight.Value * ( nextChildActualSize.Height - delta ) / nextChildActualSize.Height;
+            nextChildModel.DockHeight = new GridLength( nextChildActualSize.Height - delta, GridUnitType.Star );
-            var heightToSet = Math.Max( height, nextChildModel.DockMinHeight );
-            nextChildModel.DockHeight = new GridLength( heightToSet, GridUnitType.Star );
           }
           else
           {

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

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

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -346,6 +347,12 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
 
 
+
+
+
+
+
+
     #region CanClose
 
     /// <summary>
@@ -1153,25 +1160,25 @@ namespace Xceed.Wpf.AvalonDock.Controls
     protected virtual void SetDefaultBindings()
     {
       if( CloseCommand == null )
-        CloseCommand = _defaultCloseCommand;
+        this.SetCurrentValue( LayoutItem.CloseCommandProperty, _defaultCloseCommand );
       if( FloatCommand == null )
-        FloatCommand = _defaultFloatCommand;
+        this.SetCurrentValue( LayoutItem.FloatCommandProperty, _defaultFloatCommand );
       if( DockAsDocumentCommand == null )
-        DockAsDocumentCommand = _defaultDockAsDocumentCommand;
+        this.SetCurrentValue( LayoutItem.DockAsDocumentCommandProperty, _defaultDockAsDocumentCommand );
       if( CloseAllButThisCommand == null )
-        CloseAllButThisCommand = _defaultCloseAllButThisCommand;
+        this.SetCurrentValue( LayoutItem.CloseAllButThisCommandProperty, _defaultCloseAllButThisCommand );
       if( CloseAllCommand == null )
-        CloseAllCommand = _defaultCloseAllCommand;
+        this.SetCurrentValue( LayoutItem.CloseAllCommandProperty, _defaultCloseAllCommand );
       if( ActivateCommand == null )
-        ActivateCommand = _defaultActivateCommand;
+        this.SetCurrentValue( LayoutItem.ActivateCommandProperty, _defaultActivateCommand );
       if( NewVerticalTabGroupCommand == null )
-        NewVerticalTabGroupCommand = _defaultNewVerticalTabGroupCommand;
+        this.SetCurrentValue( LayoutItem.NewVerticalTabGroupCommandProperty, _defaultNewVerticalTabGroupCommand );
       if( NewHorizontalTabGroupCommand == null )
-        NewHorizontalTabGroupCommand = _defaultNewHorizontalTabGroupCommand;
+        this.SetCurrentValue( LayoutItem.NewHorizontalTabGroupCommandProperty, _defaultNewHorizontalTabGroupCommand );
       if( MoveToNextTabGroupCommand == null )
-        MoveToNextTabGroupCommand = _defaultMoveToNextTabGroupCommand;
+        this.SetCurrentValue( LayoutItem.MoveToNextTabGroupCommandProperty, _defaultMoveToNextTabGroupCommand );
       if( MoveToPreviousTabGroupCommand == null )
-        MoveToPreviousTabGroupCommand = _defaultMoveToPreviousTabGroupCommand;
+        this.SetCurrentValue( LayoutItem.MoveToPreviousTabGroupCommandProperty, _defaultMoveToPreviousTabGroupCommand );
 
 
       IsSelected = LayoutElement.IsSelected;

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -65,9 +66,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
             {
              // childPositionableModel.DockWidth = new GridLength( 1.0, GridUnitType.Star );
             }
-            else if( childPositionableModel != null && childPositionableModel.DockWidth.IsStar )
+            else if( (childPositionableModel != null) && childPositionableModel.DockWidth.IsStar )
             {
               var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize;
+              if( childPositionableModelWidthActualSize.ActualWidth == 0d )
+                continue;
 
               var widthToSet = Math.Max( childPositionableModelWidthActualSize.ActualWidth, childPositionableModel.DockMinWidth );
 
@@ -105,9 +108,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
             {
               //childPositionableModel.DockHeight = new GridLength( 1.0, GridUnitType.Star );
             }
-            else if( childPositionableModel != null && childPositionableModel.DockHeight.IsStar )
+            else if( (childPositionableModel != null) && childPositionableModel.DockHeight.IsStar )
             {
               var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize;
+              if( childPositionableModelWidthActualSize.ActualHeight == 0d )
+                continue;
 
               var heightToSet = Math.Max( childPositionableModelWidthActualSize.ActualHeight, childPositionableModel.DockMinHeight );
               heightToSet = Math.Min( heightToSet, ActualHeight / 2.0 );

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
@@ -20,6 +21,9 @@ using System.Windows;
 using Xceed.Wpf.AvalonDock.Layout;
 using Xceed.Wpf.AvalonDock.Themes;
 using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Threading;
+using System;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -409,6 +413,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
            this.SelectedDocument.ActivateCommand.CanExecute( null ) )
         {
           this.SelectedDocument.ActivateCommand.Execute( null );
+          this.FocusContent( this.SelectedDocument );
         }
 
         if( this.SelectedDocument == null &&
@@ -416,6 +421,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             this.SelectedAnchorable.ActivateCommand.CanExecute( null ) )
         {
           this.SelectedAnchorable.ActivateCommand.Execute( null );
+          this.FocusContent( this.SelectedAnchorable );
         }
 
         e.Handled = true;
@@ -571,6 +577,31 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
     }
 
+    private void FocusContent( LayoutItem layoutItem )
+    {
+      if( ( layoutItem == null ) || ( layoutItem.LayoutElement == null ) )
+        return;
+
+      // Set focus inside selected LayoutItem.
+      var content = layoutItem.LayoutElement.Content as UIElement;
+      if( content != null )
+      {
+        this.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
+        {
+          if( content.Focusable )
+          {
+            content.Focus();
+          }
+          else
+          {
+            content.MoveFocus( new TraversalRequest( FocusNavigationDirection.Next ) );
+          }
+        }
+         ) );
+
+      }
+    }
+
     private void OnLoaded( object sender, RoutedEventArgs e )
     {
       this.Loaded -= new RoutedEventHandler( OnLoaded );

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs

@@ -2,10 +2,11 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2019 Xceed Software Inc.
+   Copyright (C) 2007-2020 Xceed Software Inc.
 
-   This program is provided to you under the terms of the Microsoft Public
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
-   License (Ms-PL) as published at https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
 
    For more features, controls, and fast professional support,
    pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/