Port microsoft/microsoft-ui-xaml#3431 (#615)

Kinnara · Nov 18, 2023 · 8109408 · 8109408
1 parent 4acb20d
commit 8109408
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/ModernWpf.Controls/AutoSuggestBox/AutoSuggestBox.xaml b/ModernWpf.Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -7,7 +7,7 @@
     xmlns:primitives="clr-namespace:ModernWpf.Controls.Primitives">
 
     <Style TargetType="local:AutoSuggestBox">
-        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Top"/>
         <Setter Property="HorizontalContentAlignment" Value="Left"/>
         <Setter Property="IsTabStop" Value="False" />

diff --git a/ModernWpf.Controls/NumberBox/NumberBox.xaml b/ModernWpf.Controls/NumberBox/NumberBox.xaml
@@ -260,7 +260,8 @@
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+        <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>

diff --git a/ModernWpf/Styles/RichTextBox.xaml b/ModernWpf/Styles/RichTextBox.xaml
@@ -20,6 +20,7 @@
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
         <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
         <Setter Property="primitives:ControlHelper.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
@@ -60,7 +61,7 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
-                            MinWidth="{DynamicResource TextControlThemeMinWidth}"
+                            MinWidth="{TemplateBinding MinWidth}"
                             MinHeight="{DynamicResource TextControlThemeMinHeight}"
                             primitives:ValidationHelper.IsTemplateValidationAdornerSite="True" />
                         <ScrollViewer

diff --git a/test/ModernWpfTestApp/ApiTests/AutoSuggestBoxTests.cs b/test/ModernWpfTestApp/ApiTests/AutoSuggestBoxTests.cs
@@ -43,13 +43,16 @@ public void VerifyAutoSuggestBoxCornerRadius()
                 autoSuggestBox.CornerRadius = new CornerRadius(2);
                 autoSuggestBox.Focus(/*FocusState.Keyboard*/);
                 autoSuggestBox.Text = "123";
+                autoSuggestBox.MaxHeight = 32;
             });
             IdleSynchronizer.Wait();
 
             RunOnUIThread.Execute(() =>
             {
                 var textBox = TestUtilities.FindDescendents<TextBox>(autoSuggestBox).Where(e => e.Name == "TextBox").Single();
-                Verify.AreEqual(new CornerRadius(2, 2, 0, 0), textBox.GetCornerRadius());
+
+                // Flyout might open differently and as such flip corner radii values
+                Verify.IsTrue(new CornerRadius(2, 2, 0, 0) == textBox.GetCornerRadius() || new CornerRadius(0, 0, 2, 2) == textBox.GetCornerRadius());
 
                 var overlayCornerRadius = new CornerRadius(0, 0, 0, 0);
                 var radius = App.Current.Resources["OverlayCornerRadius"];
@@ -60,7 +63,9 @@ public void VerifyAutoSuggestBoxCornerRadius()
                 var popup = VisualTreeHelperEx.GetOpenPopups(WindowEx.Current).Last();
                 var popupBorder = TestUtilities.FindDescendents<Border>(popup).First();
 
-                Verify.AreEqual(new CornerRadius(0, 0, overlayCornerRadius.BottomRight, overlayCornerRadius.BottomLeft), popupBorder.CornerRadius);
+                // Flyout might open differently and as such flip corner radii values
+                Verify.IsTrue(new CornerRadius(0, 0, overlayCornerRadius.BottomRight, overlayCornerRadius.BottomLeft) == popupBorder.CornerRadius
+                    || new CornerRadius(overlayCornerRadius.TopRight, overlayCornerRadius.TopLeft, 0, 0) == popupBorder.CornerRadius);
             });
         }
 

diff --git a/test/ModernWpfTestApp/NumberBoxPage.xaml b/test/ModernWpfTestApp/NumberBoxPage.xaml
@@ -161,6 +161,16 @@
                     <controls:NumberBox x:Name="HeaderTemplateTestingNumberBox"/>
                 </StackPanel>
 
+                <!-- FontSize propagation -->
+                <controls:NumberBox Header="Header text" FontSize="50"/>
+
+                <StackPanel Orientation="Horizontal" Height="50">
+                    <controls:NumberBox PlaceholderText="Number"/>
+                    <TextBoxEx PlaceholderText="Text"/>
+                    <controls:AutoSuggestBox PlaceholderText="Auto"/>
+                    <RichEditBox PlaceholderText="Rich" Style="{StaticResource DefaultRichTextBoxStyle}"/>
+                </StackPanel>
+
                 <!-- Property propagation -->
                 <StackPanel Orientation="Horizontal">
                     <TextBoxEx Header="Header text" FontSize="14" Foreground="{ThemeResource SystemControlForegroundAccentBrush}"