From 813f4bae9aa6525fabbe3b045ab968af5d69a276 Mon Sep 17 00:00:00 2001
From: Dirkster99 <Dirk.Bahle@gmx.de>
Date: Mon, 7 Oct 2019 20:27:22 +0200
Subject: [PATCH] Apply solution in
 https://github.com/xceedsoftware/wpftoolkit/issues/1203

to all themes except Themes.Expression (since template is completely different here)
---
 .../Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml        | 10 ++++++----
 .../Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml       | 10 ++++++----
 .../Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml      | 10 ++++++----
 .../Themes/Generic.xaml                                | 10 ++++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
index ad50f536..665ff718 100644
--- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
+++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
@@ -1330,12 +1330,13 @@
                     BorderBrush="{TemplateBinding BorderBrush}">
               <Grid Margin="3">
                 <Grid.RowDefinitions>
-                  <RowDefinition Height="18" />
+                  <RowDefinition MinHeight="18" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                   <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Border x:Name="Header"
                         Padding="2,0,2,0">
-                  <Grid>
+                  <Grid
+                      UseLayoutRounding="True">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition Width="*" />
                       <ColumnDefinition Width="Auto" />
@@ -1503,14 +1504,15 @@
                     BorderBrush="{TemplateBinding BorderBrush}">
               <Grid>
                 <Grid.RowDefinitions>
-                  <RowDefinition Height="18" />
+                  <RowDefinition MinHeight="18" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                   <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Border x:Name="Header"
                         CornerRadius="1,1,0,0"
                         Padding="2,0,2,0"
                         Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
-                  <Grid>
+                  <Grid
+                      UseLayoutRounding="True">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition Width="*" />
                       <ColumnDefinition Width="Auto" />
diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
index 7227cab4..ac3a1a05 100644
--- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
+++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
@@ -1377,7 +1377,7 @@
                     BorderThickness="{TemplateBinding BorderThickness}">
               <Grid>
                 <Grid.RowDefinitions>
-                  <RowDefinition Height="24" />
+                  <RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                   <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
@@ -1393,7 +1393,8 @@
                 <Border x:Name="Header"
                         Padding="2,0,2,0"
                         Grid.Column="1">
-                  <Grid>
+                  <Grid
+                      UseLayoutRounding="True">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition Width="*" />
                       <ColumnDefinition Width="Auto" />
@@ -1564,14 +1565,15 @@
                     BorderBrush="{TemplateBinding BorderBrush}">
               <Grid>
                 <Grid.RowDefinitions>
-                  <RowDefinition Height="24" />
+                  <RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                   <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Border x:Name="Header"
                         Padding="2,0,2,0"
                         TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
                         Background="{TemplateBinding Background}">
-                  <Grid>
+                  <Grid
+                      UseLayoutRounding="True">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition Width="*" />
                       <ColumnDefinition Width="Auto" />
diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
index 87de015e..d4985082 100644
--- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
+++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
@@ -1470,12 +1470,13 @@
                     BorderBrush="{TemplateBinding BorderBrush}">
               <Grid Margin="3">
                 <Grid.RowDefinitions>
-                  <RowDefinition Height="18" />
+                  <RowDefinition MinHeight="18" Height="Auto"/><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                   <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Border x:Name="Header"
                         Padding="2,0,2,0">
-                  <Grid>
+                  <Grid
+                      UseLayoutRounding="True">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition Width="*" />
                       <ColumnDefinition Width="Auto" />
@@ -1693,7 +1694,7 @@
                     BorderBrush="{TemplateBinding BorderBrush}">
               <Grid>
                 <Grid.RowDefinitions>
-                  <RowDefinition Height="18" />
+                  <RowDefinition MinHeight="18" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                   <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <Border x:Name="Header"
@@ -1701,7 +1702,8 @@
                         Padding="2,0,2,0"
                         TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
                         Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
-                  <Grid>
+                  <Grid
+                      UseLayoutRounding="True">
                     <Grid.ColumnDefinitions>
                       <ColumnDefinition Width="*" />
                       <ColumnDefinition Width="Auto" />
diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml
index fbb20876..da0e7b90 100644
--- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml
+++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml
@@ -1674,7 +1674,7 @@
                                 BorderThickness="1">
                             <Grid>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="24" />
+                                    <RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                                     <RowDefinition Height="*" />
                                 </Grid.RowDefinitions>
 
@@ -1682,7 +1682,8 @@
                                         Padding="2,0,2,0"
                                         Background="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}"
                                         TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveText}}">
-                                    <Grid>
+                                    <Grid
+                                        UseLayoutRounding="True">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="*" />
                                             <ColumnDefinition Width="Auto" />
@@ -1999,14 +2000,15 @@
                                 BorderThickness="1">
                             <Grid>
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="24" />
+                                    <RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
                                     <RowDefinition Height="*" />
                                 </Grid.RowDefinitions>
                                 <Border x:Name="Header"
                                         Background="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveBackground}}"
                                         Padding="2,0,2,0"
                                         TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveText}}">
-                                    <Grid>
+                                    <Grid
+                                        UseLayoutRounding="True">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="*" />
                                             <ColumnDefinition Width="Auto" />