V4.4.0 Released

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,12 +15,7 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {
@@ -28,6 +25,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
     {
       string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Aero";
 
+#if NETCORE
+            assemblyName += ".NETCore";
+#elif NET5
+            assemblyName += ".NET5";
+#endif
 
       return new Uri(
           "/" + assemblyName + ";component/Theme.xaml",

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

@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,148 +15,162 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Xceed.Wpf.AvalonDock.Themes.Controls
 {
-    public class SplineBorder : Control
+  public class SplineBorder : Control
+  {
+
+    public SplineBorder()
+    {
+      //RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+    }
+
+
+    #region Thickness
+
+    /// <summary>
+    /// Thickness Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ThicknessProperty =
+        DependencyProperty.Register( "Thickness", typeof( double ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( ( double )1.0, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the Thickness property.  This dependency property 
+    /// indicates the border thickness.
+    /// </summary>
+    public double Thickness
+    {
+      get
+      {
+        return ( double )GetValue( ThicknessProperty );
+      }
+      set
+      {
+        SetValue( ThicknessProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Fill
+
+    /// <summary>
+    /// Fill Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty FillProperty =
+        DependencyProperty.Register( "Fill", typeof( Brush ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( ( Brush )null, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the Fill property.  This dependency property 
+    /// indicates the fill color.
+    /// </summary>
+    public Brush Fill
+    {
+      get
+      {
+        return ( Brush )GetValue( FillProperty );
+      }
+      set
+      {
+        SetValue( FillProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Stroke
+
+    /// <summary>
+    /// Stroke Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty StrokeProperty =
+        DependencyProperty.Register( "Stroke", typeof( Brush ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( Brushes.Black, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the Stroke property.  This dependency property 
+    /// indicates the stroke brush.
+    /// </summary>
+    public Brush Stroke
     {
+      get
+      {
+        return ( Brush )GetValue( StrokeProperty );
+      }
+      set
+      {
+        SetValue( StrokeProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region BottomBorderMargin
+
+    /// <summary>
+    /// BottomBorderMargin Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty BottomBorderMarginProperty =
+        DependencyProperty.Register( "BottomBorderMargin", typeof( double ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( ( double )0.0, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the BottomBorderMargin property.  This dependency property 
+    /// indicates the adjustment for the bottom margin.
+    /// </summary>
+    public double BottomBorderMargin
+    {
+      get
+      {
+        return ( double )GetValue( BottomBorderMarginProperty );
+      }
+      set
+      {
+        SetValue( BottomBorderMarginProperty, value );
+      }
+    }
+
+    #endregion
+
+
+
+    protected override void OnRender( DrawingContext drawingContext )
+    {
+      var pgFill = new PathGeometry();
+      var pfFill = new PathFigure() { IsFilled = true, IsClosed = true };
+      pfFill.StartPoint = new Point( ActualWidth, 0.0 );
+
+      var q1Fill = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth * 2 / 3, 0.0 ), Point2 = new Point( ActualWidth / 2.0, ActualHeight / 2.0 ), IsStroked = false };
+      pfFill.Segments.Add( q1Fill );
+      var q2Fill = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth / 3, ActualHeight ), Point2 = new Point( 0, ActualHeight ), IsStroked = false };
+      pfFill.Segments.Add( q2Fill );
+
+      pfFill.Segments.Add( new LineSegment() { Point = new Point( ActualWidth, ActualHeight ), IsStroked = false } );
+
+      pgFill.Figures.Add( pfFill );
+
+      drawingContext.DrawGeometry( Fill, null, pgFill );
+
+      var pgBorder = new PathGeometry();
+      var pfBorder = new PathFigure() { IsFilled = false, IsClosed = false };
+      pfBorder.StartPoint = new Point( ActualWidth, Thickness / 2 );
+
+      var q1Border = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth * 2 / 3, 0.0 ), Point2 = new Point( ActualWidth / 2.0, ActualHeight / 2.0 ) };
+      pfBorder.Segments.Add( q1Border );
+      var q2Border = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth / 3, ActualHeight ), Point2 = new Point( 0.0, ActualHeight - BottomBorderMargin ) };
+      pfBorder.Segments.Add( q2Border );
+
+      pgBorder.Figures.Add( pfBorder );
 
-        public SplineBorder()
+      drawingContext.DrawGeometry( null, new Pen( Stroke, Thickness ), pgBorder );
-        {
-            //RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
-        }
-
-
-        #region Thickness
-
-        /// <summary>
-        /// Thickness Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ThicknessProperty =
-            DependencyProperty.Register("Thickness", typeof(double), typeof(SplineBorder),
-                new FrameworkPropertyMetadata((double)1.0, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the Thickness property.  This dependency property 
-        /// indicates the border thickness.
-        /// </summary>
-        public double Thickness
-        {
-            get { return (double)GetValue(ThicknessProperty); }
-            set { SetValue(ThicknessProperty, value); }
-        }
-
-        #endregion
-
-        #region Fill
-
-        /// <summary>
-        /// Fill Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty FillProperty =
-            DependencyProperty.Register("Fill", typeof(Brush), typeof(SplineBorder),
-                new FrameworkPropertyMetadata((Brush)null, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the Fill property.  This dependency property 
-        /// indicates the fill color.
-        /// </summary>
-        public Brush Fill
-        {
-            get { return (Brush)GetValue(FillProperty); }
-            set { SetValue(FillProperty, value); }
-        }
-
-        #endregion
-
-        #region Stroke
-
-        /// <summary>
-        /// Stroke Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty StrokeProperty =
-            DependencyProperty.Register("Stroke", typeof(Brush), typeof(SplineBorder),
-                new FrameworkPropertyMetadata(Brushes.Black, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the Stroke property.  This dependency property 
-        /// indicates the stroke brush.
-        /// </summary>
-        public Brush Stroke
-        {
-            get { return (Brush)GetValue(StrokeProperty); }
-            set { SetValue(StrokeProperty, value); }
-        }
-
-        #endregion
-
-        #region BottomBorderMargin
-
-        /// <summary>
-        /// BottomBorderMargin Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty BottomBorderMarginProperty =
-            DependencyProperty.Register("BottomBorderMargin", typeof(double), typeof(SplineBorder),
-                new FrameworkPropertyMetadata((double)0.0, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the BottomBorderMargin property.  This dependency property 
-        /// indicates the adjustment for the bottom margin.
-        /// </summary>
-        public double BottomBorderMargin
-        {
-            get { return (double)GetValue(BottomBorderMarginProperty); }
-            set { SetValue(BottomBorderMarginProperty, value); }
-        }
-
-        #endregion
-
-
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            var pgFill = new PathGeometry();
-            var pfFill = new PathFigure() { IsFilled = true, IsClosed = true };
-            pfFill.StartPoint = new Point(ActualWidth, 0.0);
-
-            var q1Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0), IsStroked = false };
-            pfFill.Segments.Add(q1Fill);
-            var q2Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight ), Point2 = new Point(0, ActualHeight ), IsStroked = false };
-            pfFill.Segments.Add(q2Fill);
-
-            pfFill.Segments.Add(new LineSegment() { Point = new Point(ActualWidth, ActualHeight ), IsStroked = false });
-
-            pgFill.Figures.Add(pfFill);
-
-            drawingContext.DrawGeometry(Fill, null, pgFill);
-
-            var pgBorder = new PathGeometry();
-            var pfBorder = new PathFigure() { IsFilled = false, IsClosed = false };
-            pfBorder.StartPoint = new Point(ActualWidth, Thickness / 2);
-
-            var q1Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0) };
-            pfBorder.Segments.Add(q1Border);
-            var q2Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight), Point2 = new Point(0.0, ActualHeight - BottomBorderMargin) };
-            pfBorder.Segments.Add(q2Border);
-
-            pgBorder.Figures.Add(pfBorder);
-
-            drawingContext.DrawGeometry(null, new Pen(Stroke, Thickness), pgBorder);
 
-            base.OnRender(drawingContext);
+      base.OnRender( drawingContext );
-        }
     }
+  }
 }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -31,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-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 
 
 
@@ -65,7 +65,11 @@ using System;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
 

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

@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -1832,15 +1832,8 @@
             Value="WidthAndHeight" />
     <Setter Property="ResizeMode"
             Value="NoResize" />
-    <!--<Setter Property="shell:WindowChrome.WindowChrome">
+    <Setter Property="WindowStyle"
-         <Setter.Value>
+            Value="None" />
-            <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="16"
-                    CornerRadius="3,3,3,3"
-                    GlassFrameThickness="4"/>
-         </Setter.Value>
-      </Setter>-->
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
@@ -1902,7 +1895,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Tool Windows"
+                      <TextBlock Text="{Binding LayoutAnchorablesLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
@@ -1940,7 +1933,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Files"
+                      <TextBlock Text="{Binding LayoutDocumentsLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.Aero.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
+      <Link>AssemblyVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
+      <Link>AssemblyVersionInfoCommon.cs</Link>
+    </Compile>
+    <Compile Include="AeroColors.cs" />
+    <Compile Include="Controls\SplineBorder.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AeroTheme.cs" />
+    <AppDesigner Include="Properties\" />
+    <Page Include="Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinDocMenu_Black.png" />
+    <Resource Include="Images\PinMaximize.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+    <Resource Include="Images\PinRestore.png" />
+    <Resource Include="Images\PinRestore_Black.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\VTabGroup.png" />
+    <Resource Include="Images\PinDocMenu_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>

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

@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {
@@ -28,6 +25,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
     {
       string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Metro";
 
+#if NETCORE
+          assemblyName += ".NETCore";
+#elif NET5
+          assemblyName += ".NET5";
+#endif
 
       return new Uri(
           "/" + assemblyName + ";component/Theme.xaml",

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -31,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-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 
 
 
@@ -65,6 +65,10 @@ using System;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699

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

@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -1902,14 +1902,8 @@
             Value="WidthAndHeight" />
     <Setter Property="ResizeMode"
             Value="NoResize" />
-    <!--<Setter Property="shell:WindowChrome.WindowChrome">
+    <Setter Property="WindowStyle"
-            <Setter.Value>
+            Value="None" />
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="16"
-                    GlassFrameThickness="4"/>
-            </Setter.Value>
-        </Setter>-->
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
@@ -1969,7 +1963,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Tool Windows"
+                      <TextBlock Text="{Binding LayoutAnchorablesLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
@@ -2007,7 +2001,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Files"
+                      <TextBlock Text="{Binding LayoutDocumentsLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes.Metro</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.Metro.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
+      <Link>AssemblyVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
+      <Link>AssemblyVersionInfoCommon.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MetroTheme.cs" />
+    <AppDesigner Include="Properties\" />
+    <Page Include="Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinDocMenu_Black.png" />
+    <Resource Include="Images\PinMaximize.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+    <Resource Include="Images\PinRestore.png" />
+    <Resource Include="Images\PinRestore_Black.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+    <Resource Include="Images\VTabGroup.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>

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

@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -31,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-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 
 
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -64,6 +64,11 @@ using System;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
+

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

@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -2040,15 +2040,8 @@
             Value="WidthAndHeight" />
     <Setter Property="ResizeMode"
             Value="NoResize" />
-    <!--<Setter Property="shell:WindowChrome.WindowChrome">
+    <Setter Property="WindowStyle"
-            <Setter.Value>
+            Value="None" />
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="16"
-                    CornerRadius="3,3,3,3"
-                    GlassFrameThickness="4"/>
-            </Setter.Value>
-        </Setter>-->
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
@@ -2110,7 +2103,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Tool Windows"
+                      <TextBlock Text="{Binding LayoutAnchorablesLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
@@ -2148,7 +2141,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Files"
+                      <TextBlock Text="{Binding LayoutDocumentsLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4">
                       </TextBlock>

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {
@@ -28,6 +25,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
     {
       string assemblyName = "Xceed.Wpf.AvalonDock.Themes.VS2010";
 
+#if NETCORE
+        assemblyName += ".NETCore";
+#elif NET5
+        assemblyName += ".NET5";
+#endif
 
       return new Uri(
                 "/" + assemblyName + ";component/Theme.xaml",

ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.VS2010.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Page Include="Brushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
+      <Link>AssemblyVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
+      <Link>AssemblyVersionInfoCommon.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="VS2010Theme.cs" />
+    <AppDesigner Include="Properties\" />
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\VTabGroup.png" />
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+    <Resource Include="Images\PinMaximize.png" />
+    <Resource Include="Images\PinRestore.png" />
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+    <Resource Include="Images\PinDocMenu_Black.png" />
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+    <Resource Include="Images\PinRestore_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -55,6 +55,12 @@ namespace Xceed.Wpf.AvalonDock.Controls
       ILayoutAnchorablePane targetModel = _targetPane.Model as ILayoutAnchorablePane;
       LayoutAnchorable anchorableActive = floatingWindow.Descendents().OfType<LayoutAnchorable>().FirstOrDefault();
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( anchorableActive != null ) )
+      {
+        anchorableActive.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.AnchorablePaneDockBottom:
@@ -231,8 +237,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
         #endregion
-
-
         case DropTargetType.AnchorablePaneDockInside:
           #region DropTargetType.AnchorablePaneDockInside
           {
@@ -250,8 +254,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
           #endregion
-
-
       }
 
       anchorableActive.IsActive = true;

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -17,9 +17,8 @@
 
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using Xceed.Wpf.AvalonDock.Layout;
 
@@ -53,7 +53,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// Model Dependency Property
     /// </summary>
-    public static readonly DependencyProperty ModelProperty =  DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( AnchorablePaneTitle ),
+    public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( AnchorablePaneTitle ),
             new FrameworkPropertyMetadata( ( LayoutAnchorable )null, new PropertyChangedCallback( _OnModelChanged ) ) );
 
     /// <summary>
@@ -99,10 +99,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// LayoutItem Read-Only Dependency Property
     /// </summary>
-    private static readonly DependencyPropertyKey LayoutItemPropertyKey  = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( AnchorablePaneTitle ),
+    private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( AnchorablePaneTitle ),
             new FrameworkPropertyMetadata( ( LayoutItem )null ) );
 
-    public static readonly DependencyProperty LayoutItemProperty  = LayoutItemPropertyKey.DependencyProperty;
+    public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;
 
     /// <summary>
     /// Gets the LayoutItem property.  This dependency property 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 using System.ComponentModel;
+using System.Windows;
 using System.Windows.Data;
 using System.Windows.Threading;
 
@@ -42,8 +42,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
               // Ensure that no pending calls are in the dispatcher queue
               Dispatcher.CurrentDispatcher.BeginInvoke( DispatcherPriority.SystemIdle, ( Action )delegate
                  {
-                              // Remove and add the binding to re-trigger the binding error
+                   // Remove and add the binding to re-trigger the binding error
-                              dependencyObject.ClearValue( dpd.DependencyProperty );
+                   dependencyObject.ClearValue( dpd.DependencyProperty );
                    BindingOperations.SetBinding( dependencyObject, dpd.DependencyProperty, binding.ParentBindingBase );
                  } );
             }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -45,6 +45,14 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow )
     {
+      if( ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DockingManagerDockLeft:
@@ -236,7 +244,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           #endregion
       }
 
-
       base.Drop( floatingWindow );
     }
 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -35,7 +35,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         : base( overlayWindow )
     {
       _documentPaneControl = documentPaneControl;
-      base.SetScreenDetectionArea( new Rect(  _documentPaneControl.PointToScreenDPI( new Point() ),  _documentPaneControl.TransformActualSizeToAncestor() ) );
+      base.SetScreenDetectionArea( new Rect( _documentPaneControl.PointToScreenDPI( new Point() ), _documentPaneControl.TransformActualSizeToAncestor() ) );
     }
 
     #endregion

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -58,6 +58,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
       LayoutPanel parentGroupPanel;
       FindParentLayoutDocumentPane( targetModel, out parentGroup, out parentGroupPanel );
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneDockAsAnchorableBottom:

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -55,6 +55,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneDockBottom:
@@ -205,7 +214,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
               if( targetPane.DockWidth.IsStar )
               {
                 targetPane.DockWidth = new GridLength( targetPane.DockWidth.Value / 2d, GridUnitType.Star );
-                newLayoutDocumentPane.DockWidth = targetPane.DockWidth;                
+                newLayoutDocumentPane.DockWidth = targetPane.DockWidth;
               }
             }
             var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
@@ -240,7 +249,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
         #endregion
-
         case DropTargetType.DocumentPaneDockInside:
           #region DropTargetType.DocumentPaneDockInside
           {
@@ -269,8 +277,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
           #endregion
-
-
       }
 
       base.Drop( floatingWindow );
@@ -280,6 +286,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneDockBottom:

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -46,6 +46,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutPane targetModel = _targetPane.Model as ILayoutPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+      && ( floatingWindow != null )
+      && ( floatingWindow.Root != null )
+      && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneGroupDockInside:
@@ -60,6 +69,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           break;
           #endregion
       }
+
       base.Drop( floatingWindow );
     }
 
@@ -67,6 +77,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutPane targetModel = _targetPane.Model as ILayoutPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneGroupDockInside:

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
@@ -60,7 +60,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         if( skipAllOthers || offset + doc.DesiredSize.Width > finalSize.Width )
         {
           var layoutContent = doc.Content as LayoutContent;
-          if( (layoutContent != null) && layoutContent.IsSelected && !doc.IsVisible )
+          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,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -192,8 +192,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
     #region Private Methods
 
     private void GetOverlayWindowHosts()
-    {      
+    {
-      var windows = _manager.GetWindowsByZOrder().Where( w => (w != _floatingWindow) && w.IsVisible );
+      var windows = _manager.GetWindowsByZOrder().Where( w => ( w != _floatingWindow ) && w.IsVisible );
 
       foreach( var w in windows )
       {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -69,7 +69,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return _detectionRect;
       }
-    }   
+    }
 
     public DropAreaType Type
     {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,9 +15,9 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls.Primitives;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -39,8 +39,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// DropDownContextMenu Dependency Property
     /// </summary>
-    public static readonly DependencyProperty DropDownContextMenuProperty =  DependencyProperty.Register( "DropDownContextMenu", typeof( ContextMenu ), typeof( DropDownButton ),
+    public static readonly DependencyProperty DropDownContextMenuProperty = DependencyProperty.Register( "DropDownContextMenu", typeof( ContextMenu ), typeof( DropDownButton ),
-            new FrameworkPropertyMetadata( ( ContextMenu )null,  new PropertyChangedCallback( OnDropDownContextMenuChanged ) ) );
+            new FrameworkPropertyMetadata( ( ContextMenu )null, new PropertyChangedCallback( OnDropDownContextMenuChanged ) ) );
 
     /// <summary>
     /// Gets or sets the DropDownContextMenu property.  This dependency property 
@@ -83,7 +83,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// DropDownContextMenuDataContext Dependency Property
     /// </summary>
-    public static readonly DependencyProperty DropDownContextMenuDataContextProperty =  DependencyProperty.Register( "DropDownContextMenuDataContext", typeof( object ), typeof( DropDownButton ),
+    public static readonly DependencyProperty DropDownContextMenuDataContextProperty = DependencyProperty.Register( "DropDownContextMenuDataContext", typeof( object ), typeof( DropDownButton ),
             new FrameworkPropertyMetadata( ( object )null ) );
 
     /// <summary>

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -20,9 +20,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Threading;
-using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -70,7 +69,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return _targetElement;
       }
-    }    
+    }
 
     public DropTargetType Type
     {
@@ -119,7 +118,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
               currentActiveContent.IsSelected = false;
               currentActiveContent.IsActive = false;
               currentActiveContent.IsActive = true;
-              currentActiveContent.IsFloating = false;
             } ), DispatcherPriority.Background );
       }
     }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -17,15 +17,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
+using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows;
-using System.Diagnostics;
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Media;
 using System.Windows.Threading;
-using System.Reflection;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,12 +15,12 @@
 
   ***********************************************************************************/
 
-using System.Linq;
-using System.Windows.Controls;
 using System.Collections.ObjectModel;
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -45,7 +45,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// Model Dependency Property
     /// </summary>
-    public static readonly DependencyProperty ModelProperty =  DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( LayoutAnchorableControl ),
+    public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( LayoutAnchorableControl ),
             new FrameworkPropertyMetadata( ( LayoutAnchorable )null, new PropertyChangedCallback( OnModelChanged ) ) );
 
     /// <summary>
@@ -82,7 +82,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         ( ( LayoutContent )e.OldValue ).PropertyChanged -= this.Model_PropertyChanged;
       }
 
-      if( ( this.Model != null) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) )
+      if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) )
       {
         this.Model.PropertyChanged += this.Model_PropertyChanged;
         this.SetLayoutItem( this.Model.Root.Manager.GetLayoutItemFromModel( this.Model ) );
@@ -158,7 +158,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( Model != null )
           Model.IsActive = true;
-      }      
+      }
 
       base.OnGotKeyboardFocus( e );
     }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,17 +15,17 @@
 
   ***********************************************************************************/
 
+using Microsoft.Windows.Shell;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Converters;
-using System.Windows.Controls.Primitives;
 using Xceed.Wpf.AvalonDock.Commands;
-using Microsoft.Windows.Shell;
+using Xceed.Wpf.AvalonDock.Converters;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -143,9 +143,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
         _overlayWindow = null;
       }
 
-      base.OnClosed( e );      
+      base.OnClosed( e );
 
-      _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged );      
+      _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged );
       IsVisibleChanged -= this.LayoutAnchorableFloatingWindowControl_IsVisibleChanged;
       BindingOperations.ClearBinding( this, VisibilityProperty );
       BindingOperations.ClearBinding( this, SingleContentLayoutItemProperty );
@@ -336,7 +336,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private bool CanExecuteHideWindowCommand( object parameter )
     {
-      return this.CanHide( parameter );     
+      return this.CanHide( parameter );
     }
 
     private void OnExecuteHideWindowCommand( object parameter )

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,11 +16,11 @@
   ***********************************************************************************/
 
 using System;
-using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Input;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Commands;
 using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Commands;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Layout;
@@ -113,7 +112,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             _model.SelectedContent.IsActive = true;
           }
         }
-      }       
+      }
     }
 
 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -193,9 +193,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
               _mouseLastChangePositionX = currentTabScreenArea.Left + ( currentTabScreenArea.Width / 2 );
             }
 
-            if( ( containerPane is LayoutAnchorablePane ) && !( (LayoutAnchorablePane)containerPane ).CanRepositionItems )
+            if( ( containerPane is LayoutAnchorablePane ) && !( ( LayoutAnchorablePane )containerPane ).CanRepositionItems )
               return;
-            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( (LayoutAnchorablePaneGroup)containerPane.Parent ).CanRepositionItems )
+            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( ( LayoutAnchorablePaneGroup )containerPane.Parent ).CanRepositionItems )
               return;
 
             var childrenList = container.Children.ToList();

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -17,12 +17,12 @@
 
 using System;
 using System.Linq;
-using System.Windows.Interop;
-using System.Windows.Controls;
 using System.Runtime.InteropServices;
 using System.Windows;
-using System.Windows.Input;
+using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -17,10 +17,10 @@
 
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Linq;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
@@ -61,6 +61,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
 
 
+
 
 
     #endregion
@@ -100,6 +101,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
 
 
+
 
 
   }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -119,7 +119,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// LayoutItem Read-Only Dependency Property
     /// </summary>
     private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( LayoutDocumentControl ),
-      new FrameworkPropertyMetadata(( LayoutItem )null ) );
+      new FrameworkPropertyMetadata( ( LayoutItem )null ) );
 
     public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;
 
@@ -153,7 +153,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
     {
-      var setIsActive = !( (e.NewFocus != null) && (e.OldFocus != null) && (e.OldFocus is LayoutFloatingWindowControl) );
+      var setIsActive = !( ( e.NewFocus != null ) && ( e.OldFocus != null ) && ( e.OldFocus is LayoutFloatingWindowControl ) );
       if( setIsActive )
       {
         this.SetIsActive();

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,12 +15,12 @@
 
   ***********************************************************************************/
 
+using Microsoft.Windows.Shell;
 using System;
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls.Primitives;
-using Microsoft.Windows.Shell;
+using Xceed.Wpf.AvalonDock.Layout;
-using System.Linq;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,11 +15,11 @@
 
   ***********************************************************************************/
 
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Commands;
-using System.Windows.Input;
 using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Commands;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -98,7 +98,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void OnVisibilityChanged()
     {
-      if( (_document != null) && (_document.Root != null) )
+      if( ( _document != null ) && ( _document.Root != null ) )
       {
         _document.IsVisible = ( this.Visibility == Visibility.Visible );
 
@@ -141,6 +141,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
 
 
-#endregion
+    #endregion
   }
 }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -105,7 +105,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             _model.SelectedContent.IsActive = true;
           }
         }
-      }       
+      }
     }
 
     protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e )

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -63,7 +63,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// Model Dependency Property
     /// </summary>
-    public static readonly DependencyProperty ModelProperty =  DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutDocumentTabItem ),
+    public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutDocumentTabItem ),
             new FrameworkPropertyMetadata( ( LayoutContent )null, new PropertyChangedCallback( OnModelChanged ) ) );
 
     /// <summary>
@@ -201,9 +201,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
               _mouseLastChangePositionX = currentTabScreenArea.Left + ( currentTabScreenArea.Width / 2 );
             }
 
-            if( ( containerPane is LayoutDocumentPane ) && !( (LayoutDocumentPane)containerPane ).CanRepositionItems )
+            if( ( containerPane is LayoutDocumentPane ) && !( ( LayoutDocumentPane )containerPane ).CanRepositionItems )
               return;
-            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutDocumentPaneGroup ) && !( (LayoutDocumentPaneGroup)containerPane.Parent ).CanRepositionItems )
+            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutDocumentPaneGroup ) && !( ( LayoutDocumentPaneGroup )containerPane.Parent ).CanRepositionItems )
               return;
 
             var childrenList = container.Children.ToList();

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -21,13 +21,10 @@ using System.Windows;
 using System.Runtime.InteropServices;
 using System.Windows.Interop;
 using System.Windows.Input;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Documents;
 using Xceed.Wpf.AvalonDock.Themes;
 using Standard;
+using System.Windows.Threading;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -291,7 +288,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         root.FloatingWindows.Remove( this.Model as LayoutFloatingWindow );
       }
 
-      this.BringFocusOnDockingManager();  
+      this.BringFocusOnDockingManager();
     }
 
     protected override void OnInitialized( EventArgs e )
@@ -413,7 +410,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           if( wParam != IntPtr.Zero )
           {
             handled = true;
-            var client = (RECT)Marshal.PtrToStructure( lParam, typeof( RECT ) );
+            var client = ( RECT )Marshal.PtrToStructure( lParam, typeof( RECT ) );
             client.Bottom -= 1;
             Marshal.StructureToPtr( client, lParam, false );
           }
@@ -438,7 +435,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         //  break;
 
         case Win32Helper.WM_ACTIVATE:
-          if( ( (int)wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE )
+          if( ( ( int )wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE )
           {
             if( lParam == this.GetParentWindowHandle() )
             {
@@ -481,7 +478,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
         case Win32Helper.WM_SYSCOMMAND:
-          int command = (int)wParam & 0xFFF0;
+          int command = ( int )wParam & 0xFFF0;
           if( command == Win32Helper.SC_MAXIMIZE || command == Win32Helper.SC_RESTORE )
           {
             UpdateMaximizedState( command == Win32Helper.SC_MAXIMIZE );
@@ -500,7 +497,13 @@ namespace Xceed.Wpf.AvalonDock.Controls
       if( !_isClosing )
       {
         _isClosing = true;
-        this.Close();
+
+        // Added Dispatcher to prevent InvalidOperationException issue in reference to bug case 
+        // DevOps #2106
+        Dispatcher.BeginInvoke( new Action( () =>
+        {
+          this.Close();
+        } ), DispatcherPriority.Send );
       }
     }
 
@@ -513,8 +516,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
       else
       {
-        if( (this.Model != null) && ( this.Model.Root != null) && ( this.Model.Root.Manager != null ) )
+        if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) )
-        {                
+        {
           var firstUIElement = this.Model.Root.Manager.FindVisualChildren<UIElement>().Where( control => control.Focusable ).FirstOrDefault();
           if( firstUIElement != null )
           {
@@ -547,7 +550,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private void LayoutFloatingWindowControl_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
     {
-      if( (bool)e.NewValue )
+      if( ( bool )e.NewValue )
       {
       }
     }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -17,12 +17,12 @@
 
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Threading;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -68,7 +68,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return _model;
       }
-    }   
+    }
 
     public Orientation Orientation
     {
@@ -76,7 +76,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return ( _model as ILayoutOrientableGroup ).Orientation;
       }
-    } 
+    }
 
     private bool AsyncRefreshCalled
     {
@@ -405,11 +405,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
       var nextChild = GetNextVisibleChild( indexOfResizer );
 
       var prevChildActualSize = prevChild.TransformActualSizeToAncestor();
-      var nextChildActualSize = (nextChild != null) ? nextChild.TransformActualSizeToAncestor() : new Size();
+      var nextChildActualSize = ( nextChild != null ) ? nextChild.TransformActualSizeToAncestor() : new Size();
-      var totalActualSize = new Size(prevChildActualSize.Width + nextChildActualSize.Width, prevChildActualSize.Height + nextChildActualSize.Height );
+      var totalActualSize = new Size( prevChildActualSize.Width + nextChildActualSize.Width, prevChildActualSize.Height + nextChildActualSize.Height );
 
       var prevChildModel = ( ILayoutPositionableElement )( prevChild as ILayoutControl ).Model;
-      var nextChildModel = (nextChild != null) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
+      var nextChildModel = ( nextChild != null ) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
       var totalStarSize = new Size( prevChildModel.DockWidth.IsStar && nextChildModel.DockWidth.IsStar ? prevChildModel.DockWidth.Value + nextChildModel.DockWidth.Value : 1d,
                                     prevChildModel.DockHeight.IsStar && nextChildModel.DockHeight.IsStar ? prevChildModel.DockHeight.Value + nextChildModel.DockHeight.Value : 1d );
 
@@ -417,7 +417,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( prevChildModel.DockWidth.IsStar )
         {
-          prevChildModel.DockWidth = new GridLength( ((prevChildActualSize.Width + delta) / totalActualSize.Width) * totalStarSize.Width, GridUnitType.Star );
+          prevChildModel.DockWidth = new GridLength( ( ( prevChildActualSize.Width + delta ) / totalActualSize.Width ) * totalStarSize.Width, GridUnitType.Star );
         }
         else
         {
@@ -431,7 +431,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( nextChildModel.DockWidth.IsStar )
           {
-            nextChildModel.DockWidth = new GridLength( ((nextChildActualSize.Width - delta) / totalActualSize.Width) * totalStarSize.Width, GridUnitType.Star );
+            nextChildModel.DockWidth = new GridLength( ( ( nextChildActualSize.Width - delta ) / totalActualSize.Width ) * totalStarSize.Width, GridUnitType.Star );
           }
           else
           {
@@ -446,7 +446,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( prevChildModel.DockHeight.IsStar )
         {
-          prevChildModel.DockHeight = new GridLength( ((prevChildActualSize.Height + delta) / totalActualSize.Height) * totalStarSize.Height, GridUnitType.Star );
+          prevChildModel.DockHeight = new GridLength( ( ( prevChildActualSize.Height + delta ) / totalActualSize.Height ) * totalStarSize.Height, GridUnitType.Star );
         }
         else
         {
@@ -460,7 +460,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( nextChildModel.DockHeight.IsStar )
           {
-            nextChildModel.DockHeight = new GridLength( ((nextChildActualSize.Height - delta) / totalActualSize.Height) * totalStarSize.Height, GridUnitType.Star );
+            nextChildModel.DockHeight = new GridLength( ( ( nextChildActualSize.Height - delta ) / totalActualSize.Height ) * totalStarSize.Height, GridUnitType.Star );
           }
           else
           {
@@ -511,10 +511,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
       var nextChild = GetNextVisibleChild( indexOfResizer );
 
       var prevChildActualSize = prevChild.TransformActualSizeToAncestor();
-      var nextChildActualSize = (nextChild != null) ? nextChild.TransformActualSizeToAncestor() : new Size();
+      var nextChildActualSize = ( nextChild != null ) ? nextChild.TransformActualSizeToAncestor() : new Size();
 
       var prevChildModel = ( ILayoutPositionableElement )( prevChild as ILayoutControl ).Model;
-      var nextChildModel = (nextChild != null) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
+      var nextChildModel = ( nextChild != null ) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
 
       Point ptTopLeftScreen = prevChild.PointToScreenDPIWithoutFlowDirection( new Point() );
 
@@ -522,7 +522,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
       if( Orientation == System.Windows.Controls.Orientation.Horizontal )
       {
-        var nextChildDockMinWidth = (nextChildModel != null) ? nextChildModel.DockMinWidth : 0d;
+        var nextChildDockMinWidth = ( nextChildModel != null ) ? nextChildModel.DockMinWidth : 0d;
 
         actualSize = new Size(
             prevChildActualSize.Width - prevChildModel.DockMinWidth + splitter.ActualWidth + nextChildActualSize.Width - nextChildDockMinWidth,
@@ -589,7 +589,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       _resizerWindowHost.Show();
     }
 
-    private  void HideResizerOverlayWindow()
+    private void HideResizerOverlayWindow()
     {
       if( _resizerWindowHost != null )
       {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls.Primitives;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock.Controls

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -18,12 +18,12 @@
 using System;
 using System.Linq;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Controls;
-using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Commands;
 using System.Windows.Data;
+using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Controls;
+using Xceed.Wpf.AvalonDock.Commands;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,9 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Windows.Controls;
-using System.Windows;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
@@ -46,7 +43,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     protected override void OnFixChildrenDockLengths()
     {
       //               This is because the commented part is setting DockWidth of children....strange code.
-       return;
+      return;
 
       //if (ActualWidth == 0.0 ||
       //    ActualHeight == 0.0)

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -60,16 +60,16 @@ namespace Xceed.Wpf.AvalonDock.Controls
       _manager = manager;
 
       _internalSetSelectedDocument = true;
-      this.SetAnchorables( _manager.Layout.Descendents().OfType<LayoutAnchorable>().Where( a => a.IsVisible && a.IsEnabled).Select( d => (LayoutAnchorableItem)_manager.GetLayoutItemFromModel( d ) ).ToArray() );
+      this.SetAnchorables( _manager.Layout.Descendents().OfType<LayoutAnchorable>().Where( a => a.IsVisible && a.IsEnabled ).Select( d => ( LayoutAnchorableItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
-      this.SetDocuments( _manager.Layout.Descendents().OfType<LayoutDocument>().Where( d => d.IsEnabled ).OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => (LayoutDocumentItem)_manager.GetLayoutItemFromModel( d ) ).ToArray() );
+      this.SetDocuments( _manager.Layout.Descendents().OfType<LayoutDocument>().Where( d => d.IsEnabled ).OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => ( LayoutDocumentItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
       _internalSetSelectedDocument = false;
 
-      if( ( this.Documents != null) && (this.Documents.Length > 1) )
+      if( ( this.Documents != null ) && ( this.Documents.Length > 1 ) )
       {
         this.InternalSetSelectedDocument( this.Documents[ 1 ] );
         _isSelectingDocument = true;
       }
-      else if( (this.Anchorables != null) && (this.Anchorables.Count() > 1) )
+      else if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 1 ) )
       {
         this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 1 ] );
         _isSelectingDocument = false;
@@ -105,7 +105,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (LayoutDocumentItem[])GetValue( DocumentsProperty );
+        return ( LayoutDocumentItem[] )GetValue( DocumentsProperty );
       }
     }
 
@@ -117,7 +117,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// Anchorables Read-Only Dependency Property
     /// </summary>
     private static readonly DependencyPropertyKey AnchorablesPropertyKey = DependencyProperty.RegisterReadOnly( "Anchorables", typeof( IEnumerable<LayoutAnchorableItem> ), typeof( NavigatorWindow ),
-            new FrameworkPropertyMetadata( (IEnumerable<LayoutAnchorableItem>)null ) );
+            new FrameworkPropertyMetadata( ( IEnumerable<LayoutAnchorableItem> )null ) );
 
     public static readonly DependencyProperty AnchorablesProperty = AnchorablesPropertyKey.DependencyProperty;
 
@@ -129,7 +129,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (IEnumerable<LayoutAnchorableItem>)GetValue( AnchorablesProperty );
+        return ( IEnumerable<LayoutAnchorableItem> )GetValue( AnchorablesProperty );
       }
     }
 
@@ -141,7 +141,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// SelectedDocument Dependency Property
     /// </summary>
     public static readonly DependencyProperty SelectedDocumentProperty = DependencyProperty.Register( "SelectedDocument", typeof( LayoutDocumentItem ), typeof( NavigatorWindow ),
-            new FrameworkPropertyMetadata( (LayoutDocumentItem)null, new PropertyChangedCallback( OnSelectedDocumentChanged ) ) );
+            new FrameworkPropertyMetadata( ( LayoutDocumentItem )null, new PropertyChangedCallback( OnSelectedDocumentChanged ) ) );
 
     /// <summary>
     /// Gets or sets the SelectedDocument property.  This dependency property 
@@ -151,7 +151,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (LayoutDocumentItem)GetValue( SelectedDocumentProperty );
+        return ( LayoutDocumentItem )GetValue( SelectedDocumentProperty );
       }
       set
       {
@@ -164,7 +164,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// </summary>
     private static void OnSelectedDocumentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      ( (NavigatorWindow)d ).OnSelectedDocumentChanged( e );
+      ( ( NavigatorWindow )d ).OnSelectedDocumentChanged( e );
     }
 
     /// <summary>
@@ -191,7 +191,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// SelectedAnchorable Dependency Property
     /// </summary>
     public static readonly DependencyProperty SelectedAnchorableProperty = DependencyProperty.Register( "SelectedAnchorable", typeof( LayoutAnchorableItem ), typeof( NavigatorWindow ),
-            new FrameworkPropertyMetadata( (LayoutAnchorableItem)null, new PropertyChangedCallback( OnSelectedAnchorableChanged ) ) );
+            new FrameworkPropertyMetadata( ( LayoutAnchorableItem )null, new PropertyChangedCallback( OnSelectedAnchorableChanged ) ) );
 
     /// <summary>
     /// Gets or sets the SelectedAnchorable property.  This dependency property 
@@ -201,7 +201,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (LayoutAnchorableItem)GetValue( SelectedAnchorableProperty );
+        return ( LayoutAnchorableItem )GetValue( SelectedAnchorableProperty );
       }
       set
       {
@@ -214,7 +214,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// </summary>
     private static void OnSelectedAnchorableChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      ( (NavigatorWindow)d ).OnSelectedAnchorableChanged( e );
+      ( ( NavigatorWindow )d ).OnSelectedAnchorableChanged( e );
     }
 
     /// <summary>
@@ -236,6 +236,50 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     #endregion
 
+    #region LayoutDocumentsLabel
+
+    public static readonly DependencyProperty LayoutDocumentsLabelProperty = DependencyProperty.Register(
+    "LayoutDocumentsLabel",
+    typeof( string ),
+    typeof( NavigatorWindow ),
+    new FrameworkPropertyMetadata( "Active Files" ) );
+
+    public string LayoutDocumentsLabel
+    {
+      get
+      {
+        return ( string )GetValue( LayoutDocumentsLabelProperty );
+      }
+      set
+      {
+        SetValue( LayoutDocumentsLabelProperty, value );
+      }
+    }
+
+    #endregion // LayoutDocumentsLabel 
+
+    #region LayoutAnchorablesLabel
+
+    public static readonly DependencyProperty LayoutAnchorablesLabelProperty = DependencyProperty.Register(
+    "LayoutAnchorablesLabel",
+    typeof( string ),
+    typeof( NavigatorWindow ),
+    new FrameworkPropertyMetadata( "Active Tool Windows" ) );
+
+    public string LayoutAnchorablesLabel
+    {
+      get
+      {
+        return ( string )GetValue( LayoutAnchorablesLabelProperty );
+      }
+      set
+      {
+        SetValue( LayoutAnchorablesLabelProperty, value );
+      }
+    }
+
+    #endregion // LayoutAnchorablesLabel 
+
     #endregion
 
     #region Overrides   
@@ -262,7 +306,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         // Selecting LayoutDocuments
         if( _isSelectingDocument )
         {
-          if( (this.SelectedDocument != null) && ( this.Documents != null) )
+          if( ( this.SelectedDocument != null ) && ( this.Documents != null ) )
           {
             var docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
 
@@ -270,7 +314,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             {
               // Jump to next LayoutDocument
               if( ( docIndex < ( this.Documents.Length - 1 ) )
-                || (this.Anchorables == null)
+                || ( this.Anchorables == null )
                 || ( this.Anchorables.Count() == 0 ) )
               {
                 this.SelectNextDocument();
@@ -299,7 +343,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             }
             else if( ( e.Key == System.Windows.Input.Key.Left ) || ( e.Key == System.Windows.Input.Key.Right ) )
             {
-              if( (this.Anchorables != null) && (this.Anchorables.Count() > 0) )
+              if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 0 ) )
               {
                 _isSelectingDocument = false;
                 this.InternalSetSelectedDocument( null );
@@ -319,7 +363,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           // There is no SelectedDocument, select the first one.
           else
           {
-            if( ( this.Documents != null ) && (this.Documents.Length > 0) )
+            if( ( this.Documents != null ) && ( this.Documents.Length > 0 ) )
             {
               this.InternalSetSelectedDocument( this.Documents[ 0 ] );
               shouldHandle = true;
@@ -331,19 +375,19 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( this.SelectedAnchorable != null )
           {
-            var anchorableIndex = ( this.Anchorables != null) ?  this.Anchorables.ToArray().IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable ) : -1;
+            var anchorableIndex = ( this.Anchorables != null ) ? this.Anchorables.ToArray().IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable ) : -1;
 
             if( e.Key == System.Windows.Input.Key.Tab )
             {
               // Jump to next LayoutAnchorable
-              if( ( ( this.Anchorables != null) && ( anchorableIndex < ( this.Anchorables.Count() - 1 ) ) )
+              if( ( ( this.Anchorables != null ) && ( anchorableIndex < ( this.Anchorables.Count() - 1 ) ) )
                 || ( ( this.Documents != null ) && ( this.Documents.Length == 0 ) ) )
               {
                 this.SelectNextAnchorable();
                 shouldHandle = true;
               }
               // Jump to first LayoutDocument
-              else if( ( this.Documents != null) && (this.Documents.Length > 0) )
+              else if( ( this.Documents != null ) && ( this.Documents.Length > 0 ) )
               {
                 _isSelectingDocument = true;
                 this.InternalSetSelectedAnchorable( null );
@@ -365,7 +409,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             }
             else if( ( e.Key == System.Windows.Input.Key.Left ) || ( e.Key == System.Windows.Input.Key.Right ) )
             {
-              if( ( this.Documents != null) && (this.Documents.Count() > 0) )
+              if( ( this.Documents != null ) && ( this.Documents.Count() > 0 ) )
               {
                 _isSelectingDocument = true;
                 this.InternalSetSelectedAnchorable( null );
@@ -384,7 +428,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           // There is no SelectedAnchorable, select the first one.
           else
           {
-            if( ( this.Anchorables != null) && (this.Anchorables.Count() > 0) )
+            if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 0 ) )
             {
               this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 0 ] );
               shouldHandle = true;
@@ -482,7 +526,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( _manager.Theme is DictionaryTheme )
         {
-          currentThemeResourceDictionary = ( (DictionaryTheme)_manager.Theme ).ThemeResourceDictionary;
+          currentThemeResourceDictionary = ( ( DictionaryTheme )_manager.Theme ).ThemeResourceDictionary;
           this.Resources.MergedDictionaries.Add( currentThemeResourceDictionary );
         }
         else
@@ -494,7 +538,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectNextDocument()
     {
-      if( (this.SelectedDocument != null) && ( this.Documents != null) )
+      if( ( this.SelectedDocument != null ) && ( this.Documents != null ) )
       {
         int docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
         docIndex++;
@@ -508,7 +552,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectPreviousDocument()
     {
-      if( (this.SelectedDocument != null) && ( this.Documents != null) )
+      if( ( this.SelectedDocument != null ) && ( this.Documents != null ) )
       {
         int docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
         docIndex--;
@@ -522,7 +566,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectNextAnchorable()
     {
-      if( (this.SelectedAnchorable != null) && ( this.Anchorables != null) )
+      if( ( this.SelectedAnchorable != null ) && ( this.Anchorables != null ) )
       {
         var anchorablesArray = this.Anchorables.ToArray();
         int anchorableIndex = anchorablesArray.IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable );
@@ -537,7 +581,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectPreviousAnchorable()
     {
-      if( (this.SelectedAnchorable != null) && ( this.Anchorables != null ) )
+      if( ( this.SelectedAnchorable != null ) && ( this.Anchorables != null ) )
       {
         var anchorablesArray = this.Anchorables.ToArray();
         int anchorableIndex = anchorablesArray.IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable );

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -18,7 +18,6 @@
 
 namespace Standard
 {
-  using System;
   using System.Diagnostics.CodeAnalysis;
 
   /// <summary>

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -22,11 +22,11 @@
 namespace Standard
 {
   using System;
+  using System.Collections.Generic;
+  using System.Diagnostics.CodeAnalysis;
   using System.Runtime.InteropServices;
   using System.Windows;
   using System.Windows.Threading;
-  using System.Collections.Generic;
-  using System.Diagnostics.CodeAnalysis;
 
   internal sealed class MessageWindow : DispatcherObject, IDisposable
   {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -21,6 +21,7 @@
 
 namespace Standard
 {
+  using Microsoft.Win32.SafeHandles;
   using System;
   using System.ComponentModel;
   using System.Diagnostics.CodeAnalysis;
@@ -30,12 +31,8 @@ namespace Standard
   using System.Runtime.InteropServices.ComTypes;
   using System.Security.Permissions;
   using System.Text;
-  using Microsoft.Win32.SafeHandles;
-
   // Some COM interfaces and Win32 structures are already declared in the framework.
   // Interesting ones to remember in System.Runtime.InteropServices.ComTypes are:
-  using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
-  using IPersistFile = System.Runtime.InteropServices.ComTypes.IPersistFile;
   using IStream = System.Runtime.InteropServices.ComTypes.IStream;
 
   #region Native Values
@@ -1646,9 +1643,9 @@ namespace Standard
     }
   }
 
-#endregion
+  #endregion
 
-#region Native Types
+  #region Native Types
 
   [StructLayout( LayoutKind.Sequential )]
   internal struct BLENDFUNCTION
@@ -1882,7 +1879,7 @@ namespace Standard
       Assert.IsTrue( hr.Succeeded );
     }
 
-#region IDisposable Pattern
+    #region IDisposable Pattern
 
     public void Dispose()
     {
@@ -1901,7 +1898,7 @@ namespace Standard
       Clear();
     }
 
-#endregion
+    #endregion
   }
 
   [SuppressMessage( "Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses" )]
@@ -2464,7 +2461,7 @@ namespace Standard
     public ulong cBuffersEmpty;
   }
 
-#endregion
+  #endregion
 
   /// <summary>Delegate declaration that matches native WndProc signatures.</summary>
   internal delegate IntPtr WndProc( IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam );
@@ -3460,7 +3457,7 @@ namespace Standard
       }
     }
 
-#region Win7 declarations
+    #region Win7 declarations
 
     [DllImport( "shell32.dll", EntryPoint = "SHAddToRecentDocs" )]
     private static extern void _SHAddToRecentDocs_String( SHARD uFlags, [MarshalAs( UnmanagedType.LPWStr )] string pv );
@@ -3548,6 +3545,6 @@ namespace Standard
     [DllImport( "shell32.dll" )]
     public static extern HRESULT GetCurrentProcessExplicitAppUserModelID( [Out, MarshalAs( UnmanagedType.LPWStr )] out string AppID );
 
-#endregion
+    #endregion
   }
 }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -1007,7 +1007,7 @@ namespace Standard
       dpd.RemoveValueChanged( component, listener );
     }
 
-#region Extension Methods
+    #region Extension Methods
 
     public static bool IsThicknessNonNegative( Thickness thickness )
     {
@@ -1069,6 +1069,6 @@ namespace Standard
       return true;
     }
 
-#endregion
+    #endregion
   }
 }

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -18,11 +18,11 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Windows;
   using System.Windows.Input;
   using System.Windows.Interop;
-  using Standard;
 
   public static class SystemCommands
   {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -21,6 +21,7 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Collections.Generic;
   using System.ComponentModel;
@@ -28,7 +29,6 @@ namespace Microsoft.Windows.Shell
   using System.Runtime.InteropServices;
   using System.Windows;
   using System.Windows.Media;
-  using Standard;
 
   [SuppressMessage( "Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable" )]
   public class SystemParameters2 : INotifyPropertyChanged

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -21,12 +21,12 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Collections.Generic;
   using System.Diagnostics.CodeAnalysis;
   using System.Windows;
   using System.Windows.Data;
-  using Standard;
 
   public class WindowChrome : Freezable
   {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -21,18 +21,17 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Collections.Generic;
   using System.Diagnostics.CodeAnalysis;
   using System.Runtime.InteropServices;
   using System.Windows;
+  using System.Windows.Controls.Primitives;
   using System.Windows.Interop;
   using System.Windows.Media;
   using System.Windows.Threading;
-  using Standard;
-
   using HANDLE_MESSAGE = System.Collections.Generic.KeyValuePair<Standard.WM, Standard.MessageHandler>;
-  using System.Windows.Controls.Primitives;
 
   internal class WindowChromeWorker : DependencyObject
   {

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Windows.Controls;
+using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Converters

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Globalization;
+using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Properties;
 
 namespace Xceed.Wpf.AvalonDock.Converters
@@ -28,7 +28,7 @@ namespace Xceed.Wpf.AvalonDock.Converters
     {
       var isAutoHidden = value as bool?;
 
-      return (isAutoHidden != null) && isAutoHidden.Value ? Resources.Window_Restore : Resources.Anchorable_AutoHide;
+      return ( isAutoHidden != null ) && isAutoHidden.Value ? Resources.Window_Restore : Resources.Anchorable_AutoHide;
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )

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

@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 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