Skip to content

Commit 7dad231

Browse files
committed
Add right padding for popup in combobox
1 parent 5be5ec5 commit 7dad231

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Storyboard x:Key="MaterialDesignComboBoxPopupAnimationExpand">
1717
<ThicknessAnimation Storyboard.TargetName="shadow"
1818
Storyboard.TargetProperty="Margin"
19-
From="16 0 0 0" To="0 0 0 0"
19+
From="16 0 16 0" To="0 0 0 0"
2020
AccelerationRatio="0.7" DecelerationRatio="0.3"
2121
Duration="0:0:0.3"/>
2222
<DoubleAnimation Storyboard.TargetName="AnimationScrollViewer"
@@ -39,7 +39,7 @@
3939
To="0" Duration="0:0:0"/>
4040
<ThicknessAnimation Storyboard.TargetName="shadow"
4141
Storyboard.TargetProperty="Margin"
42-
To="16 0 0 0" Duration="0:0:0"/>
42+
To="16 0 16 0" Duration="0:0:0"/>
4343
</Storyboard>
4444

4545
<Style x:Key="FocusVisual">
@@ -294,7 +294,7 @@
294294
<Grid MaxHeight="{TemplateBinding MaxDropDownHeight}"
295295
x:Name="PopupTemplateRootGrid"
296296
Margin="5"
297-
MinWidth="{Binding ActualWidth, ElementName=templateRoot, Converter={StaticResource MathAddConverter}, ConverterParameter=16}">
297+
MinWidth="{Binding ActualWidth, ElementName=templateRoot, Converter={StaticResource MathAddConverter}, ConverterParameter=32}">
298298
<Grid.RowDefinitions>
299299
<RowDefinition Height="Auto"/>
300300
<RowDefinition Height="*"/>
@@ -311,7 +311,7 @@
311311
Background="Transparent"
312312
VerticalAlignment="Top"
313313
CornerRadius="2"/>
314-
<Grid Grid.Row="0" Margin="16.5 16 0 8">
314+
<Grid Grid.Row="0" Margin="16.5 16 16 8">
315315
<Grid Height="21">
316316
<Border BorderBrush="{TemplateBinding BorderBrush}"
317317
BorderThickness="{TemplateBinding BorderThickness}"
@@ -497,7 +497,7 @@
497497
<Grid MaxHeight="{TemplateBinding MaxDropDownHeight}"
498498
x:Name="PopupTemplateRootGrid"
499499
Margin="5"
500-
MinWidth="{Binding ActualWidth, ElementName=templateRoot, Converter={StaticResource MathAddConverter}, ConverterParameter=16}">
500+
MinWidth="{Binding ActualWidth, ElementName=templateRoot, Converter={StaticResource MathAddConverter}, ConverterParameter=32}">
501501
<Grid.RowDefinitions>
502502
<RowDefinition Height="Auto"/>
503503
<RowDefinition Height="*"/>
@@ -516,7 +516,7 @@
516516
CornerRadius="2"/>
517517
<Grid Grid.Row="0"
518518
x:Name="GridContentCloneWrapper"
519-
Margin="16.5 17 0 4">
519+
Margin="16.5 17 16 4">
520520
<Grid Height="24"
521521
Margin="0 -1 0 0">
522522
<Grid>
@@ -592,7 +592,7 @@
592592
<ControlTemplate.Triggers>
593593
<Trigger Property="wpf:TextFieldAssist.IsNullOrEmpty" Value="False">
594594
<Setter TargetName="GridHintWrapper" Property="Margin" Value="0 -1 0 0"/>
595-
<Setter TargetName="GridContentCloneWrapper" Property="Margin" Value="16.5 25 0 4"/>
595+
<Setter TargetName="GridContentCloneWrapper" Property="Margin" Value="16.5 25 16 4"/>
596596
<Setter TargetName="PART_Popup" Property="VerticalOffset" Value="-23"/>
597597
<Trigger.EnterActions>
598598
<BeginStoryboard x:Name="MoveHintAsideStoryboard_BeginStoryboard" Storyboard="{StaticResource MoveHintAsideStoryboard}"/>
@@ -603,7 +603,7 @@
603603
</Trigger>
604604

605605
<Trigger Property="IsEditable" Value="True">
606-
<Setter TargetName="GridContentCloneWrapper" Property="Margin" Value="16.5 25 0 4"/>
606+
<Setter TargetName="GridContentCloneWrapper" Property="Margin" Value="16.5 25 16 4"/>
607607
<Setter TargetName="PART_Popup" Property="VerticalOffset" Value="-23"/>
608608

609609
<Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible"/>

0 commit comments

Comments
 (0)