Skip to content

Commit 813f4ba

Browse files
Dirkster99Dirkster99
committed
Apply solution in
xceedsoftware/wpftoolkit#1203 to all themes except Themes.Expression (since template is completely different here)
1 parent 9fa76a7 commit 813f4ba

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

‎source/Components/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,12 +1330,13 @@
13301330
BorderBrush="{TemplateBinding BorderBrush}">
13311331
<Grid Margin="3">
13321332
<Grid.RowDefinitions>
1333-
<RowDefinition Height="18" />
1333+
<RowDefinition MinHeight="18" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
13341334
<RowDefinition Height="*" />
13351335
</Grid.RowDefinitions>
13361336
<Border x:Name="Header"
13371337
Padding="2,0,2,0">
1338-
<Grid>
1338+
<Grid
1339+
UseLayoutRounding="True">
13391340
<Grid.ColumnDefinitions>
13401341
<ColumnDefinition Width="*" />
13411342
<ColumnDefinition Width="Auto" />
@@ -1503,14 +1504,15 @@
15031504
BorderBrush="{TemplateBinding BorderBrush}">
15041505
<Grid>
15051506
<Grid.RowDefinitions>
1506-
<RowDefinition Height="18" />
1507+
<RowDefinition MinHeight="18" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
15071508
<RowDefinition Height="*" />
15081509
</Grid.RowDefinitions>
15091510
<Border x:Name="Header"
15101511
CornerRadius="1,1,0,0"
15111512
Padding="2,0,2,0"
15121513
Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
1513-
<Grid>
1514+
<Grid
1515+
UseLayoutRounding="True">
15141516
<Grid.ColumnDefinitions>
15151517
<ColumnDefinition Width="*" />
15161518
<ColumnDefinition Width="Auto" />

‎source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@
13771377
BorderThickness="{TemplateBinding BorderThickness}">
13781378
<Grid>
13791379
<Grid.RowDefinitions>
1380-
<RowDefinition Height="24" />
1380+
<RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
13811381
<RowDefinition Height="*" />
13821382
</Grid.RowDefinitions>
13831383
<Grid.ColumnDefinitions>
@@ -1393,7 +1393,8 @@
13931393
<Border x:Name="Header"
13941394
Padding="2,0,2,0"
13951395
Grid.Column="1">
1396-
<Grid>
1396+
<Grid
1397+
UseLayoutRounding="True">
13971398
<Grid.ColumnDefinitions>
13981399
<ColumnDefinition Width="*" />
13991400
<ColumnDefinition Width="Auto" />
@@ -1564,14 +1565,15 @@
15641565
BorderBrush="{TemplateBinding BorderBrush}">
15651566
<Grid>
15661567
<Grid.RowDefinitions>
1567-
<RowDefinition Height="24" />
1568+
<RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
15681569
<RowDefinition Height="*" />
15691570
</Grid.RowDefinitions>
15701571
<Border x:Name="Header"
15711572
Padding="2,0,2,0"
15721573
TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
15731574
Background="{TemplateBinding Background}">
1574-
<Grid>
1575+
<Grid
1576+
UseLayoutRounding="True">
15751577
<Grid.ColumnDefinitions>
15761578
<ColumnDefinition Width="*" />
15771579
<ColumnDefinition Width="Auto" />

‎source/Components/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,12 +1470,13 @@
14701470
BorderBrush="{TemplateBinding BorderBrush}">
14711471
<Grid Margin="3">
14721472
<Grid.RowDefinitions>
1473-
<RowDefinition Height="18" />
1473+
<RowDefinition MinHeight="18" Height="Auto"/><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
14741474
<RowDefinition Height="*" />
14751475
</Grid.RowDefinitions>
14761476
<Border x:Name="Header"
14771477
Padding="2,0,2,0">
1478-
<Grid>
1478+
<Grid
1479+
UseLayoutRounding="True">
14791480
<Grid.ColumnDefinitions>
14801481
<ColumnDefinition Width="*" />
14811482
<ColumnDefinition Width="Auto" />
@@ -1693,15 +1694,16 @@
16931694
BorderBrush="{TemplateBinding BorderBrush}">
16941695
<Grid>
16951696
<Grid.RowDefinitions>
1696-
<RowDefinition Height="18" />
1697+
<RowDefinition MinHeight="18" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
16971698
<RowDefinition Height="*" />
16981699
</Grid.RowDefinitions>
16991700
<Border x:Name="Header"
17001701
CornerRadius="1,1,0,0"
17011702
Padding="2,0,2,0"
17021703
TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
17031704
Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
1704-
<Grid>
1705+
<Grid
1706+
UseLayoutRounding="True">
17051707
<Grid.ColumnDefinitions>
17061708
<ColumnDefinition Width="*" />
17071709
<ColumnDefinition Width="Auto" />

‎source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Themes/Generic.xaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,15 +1674,16 @@
16741674
BorderThickness="1">
16751675
<Grid>
16761676
<Grid.RowDefinitions>
1677-
<RowDefinition Height="24" />
1677+
<RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
16781678
<RowDefinition Height="*" />
16791679
</Grid.RowDefinitions>
16801680

16811681
<Border x:Name="Header"
16821682
Padding="2,0,2,0"
16831683
Background="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveBackground}}"
16841684
TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.DocumentWellTabSelectedInactiveText}}">
1685-
<Grid>
1685+
<Grid
1686+
UseLayoutRounding="True">
16861687
<Grid.ColumnDefinitions>
16871688
<ColumnDefinition Width="*" />
16881689
<ColumnDefinition Width="Auto" />
@@ -1999,14 +2000,15 @@
19992000
BorderThickness="1">
20002001
<Grid>
20012002
<Grid.RowDefinitions>
2002-
<RowDefinition Height="24" />
2003+
<RowDefinition MinHeight="24" Height="Auto" /><!-- https://github.com/xceedsoftware/wpftoolkit/issues/1203 -->
20032004
<RowDefinition Height="*" />
20042005
</Grid.RowDefinitions>
20052006
<Border x:Name="Header"
20062007
Background="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveBackground}}"
20072008
Padding="2,0,2,0"
20082009
TextElement.Foreground="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionInactiveText}}">
2009-
<Grid>
2010+
<Grid
2011+
UseLayoutRounding="True">
20102012
<Grid.ColumnDefinitions>
20112013
<ColumnDefinition Width="*" />
20122014
<ColumnDefinition Width="Auto" />

0 commit comments

Comments
 (0)