Revert "[Settings / OOBE] Adding Mica (#24327)" (#24875)

This reverts commit 4291fa5.
microsoft · Mar 17, 2023 · 7d4e804 · 7d4e804
1 parent 41997eb
commit 7d4e804
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml b/src/settings-ui/Settings.UI/MainWindow.xaml
@@ -1,19 +1,14 @@
-<winuiex:WindowEx
+<Window
     x:Class="Microsoft.PowerToys.Settings.UI.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:winuiex="using:WinUIEx"
-    MinWidth="480"
-    MinHeight="480"
     Closed="Window_Closed"
     mc:Ignorable="d">
-    <winuiex:WindowEx.Backdrop>
-        <winuiex:MicaSystemBackdrop />
-    </winuiex:WindowEx.Backdrop>
+
     <Grid>
         <local:ShellPage />
     </Grid>
-</winuiex:WindowEx>
+</Window>
diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml.cs b/src/settings-ui/Settings.UI/MainWindow.xaml.cs
@@ -22,7 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI
     /// <summary>
     /// An empty window that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class MainWindow : WindowEx
+    public sealed partial class MainWindow : Window
     {
         public MainWindow(bool isDark, bool createHidden = false)
         {

diff --git a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
@@ -3,11 +3,17 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
+    xmlns:localModels="using:Microsoft.PowerToys.Settings.UI.OOBE.ViewModel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="using:CommunityToolkit.WinUI.UI"
     HighContrastAdjustment="None"
     mc:Ignorable="d">
-    <Grid>
+    <!--
+        todo(Stefan):
+        BackdropMaterial.ApplyToRootOrPageBackground="True"
+    -->
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
         <NavigationView
             x:Name="NavigationView"
             IsBackButtonVisible="Collapsed"

diff --git a/src/settings-ui/Settings.UI/OobeWindow.xaml b/src/settings-ui/Settings.UI/OobeWindow.xaml
@@ -1,19 +1,14 @@
-<winuiex:WindowEx
+<Window
     x:Class="Microsoft.PowerToys.Settings.UI.OobeWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Closed="Window_Closed"
-    MinWidth="480"
-    MinHeight="480"
-    xmlns:winuiex="using:WinUIEx"
     mc:Ignorable="d">
-    <winuiex:WindowEx.Backdrop>
-        <winuiex:MicaSystemBackdrop/>
-    </winuiex:WindowEx.Backdrop>
+
     <Grid>
         <local:OobeShellPage x:Name="shellPage" />
     </Grid>
-</winuiex:WindowEx>
+</Window>
diff --git a/src/settings-ui/Settings.UI/OobeWindow.xaml.cs b/src/settings-ui/Settings.UI/OobeWindow.xaml.cs
@@ -13,14 +13,13 @@
 using Microsoft.UI.Xaml;
 using Windows.ApplicationModel.Resources;
 using Windows.Graphics;
-using WinUIEx;
 
 namespace Microsoft.PowerToys.Settings.UI
 {
     /// <summary>
     /// An empty window that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class OobeWindow : WindowEx
+    public sealed partial class OobeWindow : Window
     {
         private PowerToysModules initialModule;
 

diff --git a/src/settings-ui/Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/Views/ShellPage.xaml
@@ -11,14 +11,21 @@
     xmlns:views="using:Microsoft.PowerToys.Settings.UI.Views"
     HighContrastAdjustment="None"
     mc:Ignorable="d">
+    <!--
+        TODO(stefan): Bring back Should be available in v1.1
+        BackdropMaterial.ApplyToRootOrPageBackground="True"
+    -->
 
     <i:Interaction.Behaviors>
         <ic:EventTriggerBehavior EventName="Loaded">
             <ic:InvokeCommandAction Command="{x:Bind ViewModel.LoadedCommand}" />
         </ic:EventTriggerBehavior>
     </i:Interaction.Behaviors>
 
-    <Grid x:Name="RootGrid">
+    <Grid
+        x:Name="RootGrid"
+        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
         <NavigationView
             x:Name="navigationView"
             CompactModeThresholdWidth="1007"