Skip to content

Commit

Permalink
Apply solution in
Browse files Browse the repository at this point in the history 
xceedsoftware/wpftoolkit#1203

to all themes except Themes.Expression (since template is completely different here)
  • Loading branch information
@Dirkster99
Dirkster99 committed Oct 7, 2019
1 parent 9fa76a7 commit 813f4ba
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
10 changes: 6 additions & 4 deletions source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
10 changes: 6 additions & 4 deletions source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
10 changes: 6 additions & 4 deletions source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -1693,15 +1694,16 @@
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"
TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
<Grid>
<Grid
UseLayoutRounding="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
Expand Down
10 changes: 6 additions & 4 deletions source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1674,15 +1674,16 @@
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"
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" />
Expand Down Expand Up @@ -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" />
Expand Down

0 comments on commit 813f4ba

Please sign in to comment.