Skip to content

Commit 39adb92

Browse files
committed
Update MaterialDesignPopupBoxButton style properties
Modified padding, added cursor, and updated vertical alignment.
1 parent e5d0c3d commit 39adb92

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<Style x:Key="MaterialDesignPopupBoxButton" TargetType="{x:Type Button}">
1313
<Setter Property="Foreground" Value="{DynamicResource MaterialDesign.Brush.Foreground}" />
1414
<Setter Property="HorizontalContentAlignment" Value="Left" />
15-
<Setter Property="Padding" Value="16,0,16,16" />
15+
<Setter Property="Cursor" Value="Hand" />
16+
<Setter Property="Padding" Value="16,0,16,0" />
1617
<Setter Property="Template">
1718
<Setter.Value>
1819
<ControlTemplate TargetType="{x:Type Button}">
@@ -30,38 +31,38 @@
3031
<VisualState Name="MouseOver">
3132
<Storyboard>
3233
<DoubleAnimation Storyboard.TargetName="MouseOverBorder"
33-
Storyboard.TargetProperty="Opacity"
34-
To="0.1"
35-
Duration="0" />
34+
Storyboard.TargetProperty="Opacity"
35+
To="0.1"
36+
Duration="0" />
3637
</Storyboard>
3738
</VisualState>
3839
<VisualState Name="Disabled">
3940
<Storyboard>
4041
<DoubleAnimation Storyboard.TargetProperty="Opacity"
41-
To="0.48"
42-
Duration="0" />
42+
To="0.48"
43+
Duration="0" />
4344
</Storyboard>
4445
</VisualState>
4546
</VisualStateGroup>
4647
</VisualStateManager.VisualStateGroups>
4748
<Border x:Name="MouseOverBorder"
48-
Background="{TemplateBinding Foreground, Converter={x:Static converters:BrushRoundConverter.Instance}}"
49-
Opacity="0" />
49+
Background="{TemplateBinding Foreground, Converter={x:Static converters:BrushRoundConverter.Instance}}"
50+
Opacity="0" />
5051
<wpf:Ripple MinHeight="48"
51-
Padding="{TemplateBinding Padding}"
52-
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
53-
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
54-
Content="{TemplateBinding Content}"
55-
ContentTemplate="{TemplateBinding ContentTemplate}"
56-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
57-
Feedback="{TemplateBinding Foreground, Converter={x:Static converters:BrushRoundConverter.Instance}}"
58-
Focusable="False"
59-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
52+
Padding="{TemplateBinding Padding}"
53+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
54+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
55+
Content="{TemplateBinding Content}"
56+
ContentTemplate="{TemplateBinding ContentTemplate}"
57+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
58+
Feedback="{TemplateBinding Foreground, Converter={x:Static converters:BrushRoundConverter.Instance}}"
59+
Focusable="False"
60+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
6061
</Grid>
6162
</ControlTemplate>
6263
</Setter.Value>
6364
</Setter>
64-
<Setter Property="VerticalContentAlignment" Value="Bottom" />
65+
<Setter Property="VerticalContentAlignment" Value="Center" />
6566
</Style>
6667

6768
<wpf:PackIcon x:Key="MaterialDesignPopupBoxToggleContent"

0 commit comments

Comments
 (0)