Update to WinAppSDK 1.4.1 and remove menu theme workaround (microsoft…

…#1359)
marcelwgn · Sep 20, 2023 · 398af50 · 398af50
1 parent 9c80909
commit 398af50
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 35 deletions.
diff --git a/WinUIGallery/ControlPages/MenuBarPage.xaml b/WinUIGallery/ControlPages/MenuBarPage.xaml
@@ -12,7 +12,7 @@
                               XamlSource="MenuBar\MenuBarSample1.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText" Text="" />
-                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated"  x:Name="Example1">
+                <MenuBar x:Name="Example1">
                     <MenuBarItem Title="File">
                         <MenuFlyoutItem x:Name="o1" Text="New" Click="OnElementClicked"/>
                         <MenuFlyoutItem x:Name="o2" Text="Open" Click="OnElementClicked"/>
@@ -38,7 +38,7 @@
                               XamlSource="Menubar\MenuBarSample3.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText1" Text="" />
-                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated" x:Name="Example2">
+                <MenuBar x:Name="Example2">
                     <MenuBarItem Title="File">
                         <MenuFlyoutItem x:Name ="t2" Text="New" Click="OnElementClicked">
                             <MenuFlyoutItem.KeyboardAccelerators>
@@ -101,7 +101,7 @@
                               XamlSource="MenuBar\MenuBarSample2.txt">
             <StackPanel>
                 <TextBlock x:Name="SelectedOptionText2" Text="" />
-                <MenuBar LayoutUpdated="MenuBar_LayoutUpdated" x:Name="Example3">
+                <MenuBar x:Name="Example3">
                     <MenuBarItem Title="File">
                         <MenuFlyoutSubItem Text="New">
                             <MenuFlyoutItem x:Name="z1" Text="Plain Text Document" Click="OnElementClicked"/>

diff --git a/WinUIGallery/ControlPages/MenuBarPage.xaml.cs b/WinUIGallery/ControlPages/MenuBarPage.xaml.cs
@@ -1,5 +1,4 @@
-using AppUIBasics.Helper;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -39,15 +38,6 @@ private void OnElementClicked(object sender, Microsoft.UI.Xaml.RoutedEventArgs e
             {
                 SelectedOptionText2.Text = "You clicked: " + (sender as MenuFlyoutItem).Text;
             }
-        }
-
-        // Workaround for known issue with menu themes in WinAppSDK 1.4 (#8678, #8756)
-        private void MenuBar_LayoutUpdated(object sender, object e)
-        {
-            foreach (var popup in VisualTreeHelper.GetOpenPopupsForXamlRoot(this.XamlRoot))
-            {
-                popup.RequestedTheme = ThemeHelper.RootTheme;
-            }
-        }
+        }
     }
 }
diff --git a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 //*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
@@ -19,7 +19,7 @@
             <StackPanel x:Name="Control1" Orientation="Horizontal">
                 <AppBarButton Icon="Sort" IsCompact="True" ToolTipService.ToolTip="Sort" AutomationProperties.Name="Sort">
                     <Button.Flyout>
-                        <MenuFlyout Opened="MenuFlyout_Opened">
+                        <MenuFlyout>
                             <MenuFlyoutItem Text="By rating" Click="MenuFlyoutItem_Click" Tag="rating" />
                             <MenuFlyoutItem Text="By match" Click="MenuFlyoutItem_Click" Tag="match" />
                             <MenuFlyoutItem Text="By distance" Click="MenuFlyoutItem_Click" Tag="distance" />
@@ -46,7 +46,7 @@
                 HeaderText="A MenuFlyout with ToggleMenuFlyoutItems and MenuFlyoutSeparator.">
             <Button x:Name="Control2" Content="Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Reset" />
                         <MenuFlyoutSeparator />
                         <ToggleMenuFlyoutItem x:Name="RepeatToggleMenuFlyoutItem" Text="Repeat" IsChecked="True" />
@@ -76,7 +76,7 @@
         <local:ControlExample x:Name="Example3" HeaderText="A MenuFlyout with cascading menus.">
             <Button x:Name="Control3" Content="File Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Open" />
                         <MenuFlyoutSubItem Text="Send to">
                             <MenuFlyoutItem Text="Bluetooth" />
@@ -115,7 +115,7 @@
                 HeaderText="A MenuFlyout with icons.">
             <Button x:Name="Control4" Content="Edit Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Share">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE72D;" />
@@ -154,7 +154,7 @@
                 HeaderText="A MenuFlyout with icons and Keyboard Accelerators." FontFamily="Segoe UI" Loaded="Example5_Loaded">
             <Button x:Name="Control5" Content="Edit Options">
                 <Button.Flyout>
-                    <MenuFlyout  Opened="MenuFlyout_Opened">
+                    <MenuFlyout>
                         <MenuFlyoutItem Text="Share">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon Glyph="&#xE72D;" />

diff --git a/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs b/WinUIGallery/ControlPages/MenuFlyoutPage.xaml.cs
@@ -1,4 +1,4 @@
-//*********************************************************
+//*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
 // THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
@@ -7,12 +7,10 @@
 // PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
 //
 //*********************************************************
-using AppUIBasics.Helper;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
 
 namespace AppUIBasics.ControlPages
 {
@@ -47,15 +45,6 @@ private void MenuFlyoutItem_Click(object sender, RoutedEventArgs e)
         private void Example5_Loaded(object sender, RoutedEventArgs e)
         {
 
-        }
-
-        // Workaround for known issue with menu themes in WinAppSDK 1.4 (#8678, #8756)
-        private void MenuFlyout_Opened(object sender, object e)
-        {
-            foreach (var popup in VisualTreeHelper.GetOpenPopupsForXamlRoot(this.XamlRoot))
-            {
-                popup.RequestedTheme = ThemeHelper.RootTheme;
-            }
-        }
+        }
     }
 }
diff --git a/WinUIGallery/standalone.props b/WinUIGallery/standalone.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- The NuGet versions of dependencies to build against. -->
-    <WindowsAppSdkPackageVersion>1.4.230822000</WindowsAppSdkPackageVersion>
+    <WindowsAppSdkPackageVersion>1.4.230913002</WindowsAppSdkPackageVersion>
     <SamplesTargetFrameworkMoniker>net6.0-windows10.0.19041.0</SamplesTargetFrameworkMoniker>
     <MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
     <GraphicsWin2DVersion>1.0.4</GraphicsWin2DVersion>