Port microsoft/microsoft-ui-xaml#4747 (#641)

Kinnara · Dec 7, 2023 · e0f535e · e0f535e
1 parent f82124d
commit e0f535e
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/test/ModernWpfTestApp/MenuFlyoutPage.xaml b/test/ModernWpfTestApp/MenuFlyoutPage.xaml
@@ -10,7 +10,26 @@
     mc:Ignorable="d">
 
     <Grid Background="{DynamicResource ApplicationPageBackgroundThemeBrush}" Margin="12">
-        <StackPanel>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <StackPanel Grid.RowSpan="2">
+            <ButtonEx Content="Short Text MenuFlyout" x:Name="TestMenuFlyoutButton" AutomationProperties.Name="TestMenuFlyoutButton" Margin="0,0,0,12">
+                <ButtonEx.Flyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem Text="Reset" x:Name="TestMenuFlyoutItem" AutomationProperties.Name="TestMenuFlyoutItem" Click="TestMenuFlyoutItemClick"/>
+                        <MenuFlyoutSeparator />
+                        <MenuFlyoutItem Text="Repeat" />
+                        <MenuFlyoutItem Text="Shuffle" />
+                    </MenuFlyout>
+                </ButtonEx.Flyout>
+            </ButtonEx>
+
             <Button Content="MenuFlyout"  VerticalAlignment="Top">
                 <muxc:FlyoutService.Flyout>
                     <muxc:MenuFlyout>
@@ -102,5 +121,22 @@
                 </muxc:FlyoutService.Flyout>
             </Button>
         </StackPanel>
+
+        <Grid Grid.Column="1" Margin="20,0,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="MenuFlyoutItem height: "/>
+            <TextBlock x:Name="TestMenuFlyoutItemHeightTextBlock" AutomationProperties.Name="TestMenuFlyoutItemHeightTextBlock" Text="0" Grid.Column="1" Margin="5, 0, 0, 0"/>
+
+            <TextBlock Text="MenuFlyoutItem width: " Grid.Row="1"/>
+            <TextBlock x:Name="TestMenuFlyoutItemWidthTextBlock" AutomationProperties.Name="TestMenuFlyoutItemWidthTextBlock" Text="0" Grid.Row="1" Grid.Column="1" Margin="5, 0, 0, 0"/>
+        </Grid>
     </Grid>
 </local:TestPage>
diff --git a/test/ModernWpfTestApp/MenuFlyoutPage.xaml.cs b/test/ModernWpfTestApp/MenuFlyoutPage.xaml.cs
@@ -11,5 +11,11 @@ public MenuFlyoutPage()
         {
             InitializeComponent();
         }
+
+        private void TestMenuFlyoutItemClick(object sender, object e)
+        {
+            TestMenuFlyoutItemHeightTextBlock.Text = $"{TestMenuFlyoutItem.ActualHeight}";
+            TestMenuFlyoutItemWidthTextBlock.Text = $"{TestMenuFlyoutItem.ActualWidth}";
+        }
     }
 }