From f8524f16ec7ba4d93bf0f601c76f410f1e962c0c Mon Sep 17 00:00:00 2001 From: Dirkster99 Date: Mon, 13 Apr 2020 19:08:24 +0200 Subject: [PATCH] Fixing Issue #148 for non-Generic themes --- .../AvalonDock.Themes.Aero/Theme.xaml | 29 +- .../AvalonDock.Themes.Expression/Theme.xaml | 21 +- .../AvalonDock.Themes.Metro/Theme.xaml | 21 +- .../AvalonDock.Themes.VS2010/Theme.xaml | 3882 ++++++++--------- .../Themes/Generic.xaml | 21 +- source/MLibTest/MLibTest/MainWindow.xaml | 2 + 6 files changed, 1874 insertions(+), 2102 deletions(-) diff --git a/source/Components/AvalonDock.Themes.Aero/Theme.xaml b/source/Components/AvalonDock.Themes.Aero/Theme.xaml index a6f839af..d9bf9ada 100644 --- a/source/Components/AvalonDock.Themes.Aero/Theme.xaml +++ b/source/Components/AvalonDock.Themes.Aero/Theme.xaml @@ -1,11 +1,13 @@ - + ************************************************************************ +--> + Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" + ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" + ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}" + Grid.Row="1"/>--> + + + + + + + + diff --git a/source/Components/AvalonDock.Themes.Expression/Theme.xaml b/source/Components/AvalonDock.Themes.Expression/Theme.xaml index 48c72bb0..42199afb 100644 --- a/source/Components/AvalonDock.Themes.Expression/Theme.xaml +++ b/source/Components/AvalonDock.Themes.Expression/Theme.xaml @@ -1,11 +1,13 @@ - + ************************************************************************ +--> + + + + + + + + diff --git a/source/Components/AvalonDock.Themes.Metro/Theme.xaml b/source/Components/AvalonDock.Themes.Metro/Theme.xaml index 314d1cd2..ad197d86 100644 --- a/source/Components/AvalonDock.Themes.Metro/Theme.xaml +++ b/source/Components/AvalonDock.Themes.Metro/Theme.xaml @@ -1,11 +1,13 @@ - + ************************************************************************ +--> + + + + + + + + diff --git a/source/Components/AvalonDock.Themes.VS2010/Theme.xaml b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml index 259d45a0..665109ba 100644 --- a/source/Components/AvalonDock.Themes.VS2010/Theme.xaml +++ b/source/Components/AvalonDock.Themes.VS2010/Theme.xaml @@ -1,1912 +1,1629 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml index ab50b10d..58db40d6 100644 --- a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml +++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml @@ -1,11 +1,13 @@ - + ************************************************************************ +--> + @@ -1666,6 +1673,16 @@ + + + + + + + diff --git a/source/MLibTest/MLibTest/MainWindow.xaml b/source/MLibTest/MLibTest/MainWindow.xaml index 65accb03..ec65309f 100644 --- a/source/MLibTest/MLibTest/MainWindow.xaml +++ b/source/MLibTest/MLibTest/MainWindow.xaml @@ -99,6 +99,8 @@ AnchorablesSource="{Binding Tools}" DataContext="{Binding AD_WorkSpace}" DocumentsSource="{Binding Files}" + IsVirtualizingLayoutAnchorable="True" + IsVirtualizingLayoutDocument="True" Visibility="Hidden">