Skip to content

Commit 72ec283

Browse files
Fix 3549: Forward relevant DPs to the nested Button (#3588)
* Forward relevant DPs to the nested Button * Respect VerticalContentAlignment * Respect SnapsToDevicePixels and UseLayoutRounding at root template element
1 parent abd9f3f commit 72ec283

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.SplitButton.xaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
<Grid x:Name="OuterGrid"
4040
Margin="{TemplateBinding Margin}"
4141
Height="{TemplateBinding Height}"
42+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
43+
UseLayoutRounding="{TemplateBinding UseLayoutRounding}"
4244
Width="{TemplateBinding Width}"
4345
Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ElevationAssist.Elevation), Converter={x:Static converters:ShadowConverter.Instance}}">
4446
<Grid.ColumnDefinitions>
@@ -53,9 +55,18 @@
5355
CommandParameter="{TemplateBinding CommandParameter}"
5456
CommandTarget="{TemplateBinding CommandTarget}"
5557
Content="{TemplateBinding Content}"
58+
ContentStringFormat="{TemplateBinding ContentStringFormat}"
59+
ContentTemplate="{TemplateBinding ContentTemplate}"
60+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
61+
FontSize="{TemplateBinding FontSize}"
62+
FontFamily="{TemplateBinding FontFamily}"
63+
FontStretch="{TemplateBinding FontStretch}"
64+
FontStyle="{TemplateBinding FontStyle}"
65+
FontWeight="{TemplateBinding FontWeight}"
5666
Height="{TemplateBinding Height}"
5767
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
5868
Style="{TemplateBinding ButtonStyle}"
69+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
5970
Padding="{TemplateBinding Padding}"
6071
wpf:ElevationAssist.Elevation="Dp0"
6172
wpf:ButtonAssist.CornerRadius="{TemplateBinding wpf:ButtonAssist.CornerRadius, Converter={StaticResource LeftButtonCornerRadiusConverter}}"/>
@@ -77,6 +88,7 @@
7788
IsHitTestVisible="True"
7889
Padding="{TemplateBinding Padding}"
7990
Style="{TemplateBinding ButtonStyle}"
91+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
8092
wpf:ElevationAssist.Elevation="Dp0"
8193
wpf:ButtonAssist.CornerRadius="{TemplateBinding wpf:ButtonAssist.CornerRadius, Converter={StaticResource RightButtonCornerRadiusConverter}}"
8294
wpf:RippleAssist.IsDisabled="False"

0 commit comments

Comments
 (0)