Port microsoft/microsoft-ui-xaml#4799 (#655)

Kinnara · Dec 16, 2023 · 09a7358 · 09a7358
1 parent 673c607
commit 09a7358
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/ModernWpf/Styles/AutoSuggestBox.xaml b/ModernWpf/Styles/AutoSuggestBox.xaml
@@ -11,8 +11,10 @@
     </ResourceDictionary.MergedDictionaries>
 
     <Thickness x:Key="AutoSuggestBoxTopHeaderMargin">0,0,0,8</Thickness>
-    <Thickness x:Key="AutoSuggestBoxInnerButtonMargin">0,3</Thickness>
+    <Thickness x:Key="AutoSuggestBoxInnerButtonMargin">1,3</Thickness>
+    <Thickness x:Key="AutoSuggestBoxDeleteButtonMargin">0,4</Thickness>
     <Thickness x:Key="AutoSuggestBoxQueryButtonPadding">3,2</Thickness>
+    <sys:Double x:Key="AutoSuggestBoxLeftButtonMargin">3</sys:Double>
     <sys:Double x:Key="AutoSuggestBoxRightButtonMargin">4</sys:Double>
 
     <Style TargetType="TextBox" x:Key="AutoSuggestBoxTextBoxStyle">
@@ -65,11 +67,11 @@
                                         </ControlTemplate.Resources>
                                         <Border
                                             x:Name="ButtonLayoutGrid"
-                                            Margin="{DynamicResource AutoSuggestBoxInnerButtonMargin}"
                                             BorderBrush="{DynamicResource TextControlButtonBorderBrush}"
                                             BorderThickness="{TemplateBinding BorderThickness}"
                                             Background="{DynamicResource TextControlButtonBackground}"
-                                            CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}">
+                                            Margin="{StaticResource AutoSuggestBoxDeleteButtonMargin}"
+                                            CornerRadius="{DynamicResource ControlCornerRadius}">
                                             <local:FontIconFallback
                                                 x:Name="GlyphElement"
                                                 Foreground="{DynamicResource TextControlButtonForeground}"
@@ -217,9 +219,9 @@
                         <Button
                             x:Name="DeleteButton"
                             Grid.Row="1"
+                            primitives:ControlHelper.CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
                             Style="{StaticResource DeleteButtonStyle}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            primitives:ControlHelper.CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
                             Padding="{DynamicResource HelperButtonThemePadding}"
                             Focusable="False"
                             Grid.Column="1"
@@ -231,12 +233,13 @@
                         <Button
                             x:Name="QueryButton"
                             Grid.Row="1"
+                            Grid.Column="2"
                             primitives:ControlHelper.CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
                             Style="{StaticResource QueryButtonStyle}"
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            Margin="2,0,0,0"
                             Padding="{DynamicResource HelperButtonThemePadding}"
                             Focusable="False"
-                            Grid.Column="2"
                             FontSize="{TemplateBinding FontSize}"
                             Width="32"
                             Height="28"