Skip to content

Commit a3452ec

Browse files
Updates logic to account for margin on ComboBox toggleButton and ComboBox PART_ClearButton based on margin on ComboBox InnerRoot (#2463)
The Top Margin (indicating the floatingHintOffset) is set on the InnerRoot when the HintAssist.IsFloting is set
1 parent 7f6e068 commit a3452ec

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

MaterialDesignThemes.Wpf/Converters/ComboBoxClearButtonMarginConverter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
1111
{
1212
var padding = (Thickness)values[0];
1313
var borderThickness = (Thickness)values[1];
14+
var floatingHintTopOffset = ((Thickness)values[2]).Top;
1415
return new Thickness(
1516
borderThickness.Left,
16-
borderThickness.Top + padding.Top,
17+
borderThickness.Top + padding.Top + floatingHintTopOffset,
1718
borderThickness.Right + padding.Right + Constants.ComboBoxArrowSize + Constants.TextBoxInnerButtonSpacing,
1819
borderThickness.Bottom + padding.Bottom);
1920
}

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ComboBox.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@
312312
Style="{StaticResource MaterialDesignComboBoxToggleButton}"
313313
BorderBrush="{TemplateBinding BorderBrush}"
314314
Background="{TemplateBinding Background}"
315-
Padding="{TemplateBinding Padding}" />
315+
Padding="{TemplateBinding Padding}"
316+
Margin="{Binding ElementName=InnerRoot, Path=Margin}"/>
316317
<Border
317318
x:Name="templateRoot"
318319
BorderBrush="{TemplateBinding BorderBrush}"
@@ -478,6 +479,7 @@
478479
<MultiBinding Converter="{StaticResource ComboBoxClearButtonMarginConverter}">
479480
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="Padding" />
480481
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BorderThickness" />
482+
<Binding ElementName="InnerRoot" Path="Margin" />
481483
</MultiBinding>
482484
</Button.Margin>
483485
<Button.Visibility>

0 commit comments

Comments
 (0)