From 7d4e804cecf1f11b42fc536b4d1b47efe0c27388 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Fri, 17 Mar 2023 23:25:14 +0100
Subject: [PATCH] Revert "[Settings / OOBE] Adding Mica (#24327)" (#24875)

This reverts commit 4291fa57f9001ed84ce5d6f90f992c77aa8b964f.
---
 src/settings-ui/Settings.UI/MainWindow.xaml           | 11 +++--------
 src/settings-ui/Settings.UI/MainWindow.xaml.cs        |  2 +-
 .../Settings.UI/OOBE/Views/OobeShellPage.xaml         |  8 +++++++-
 src/settings-ui/Settings.UI/OobeWindow.xaml           | 11 +++--------
 src/settings-ui/Settings.UI/OobeWindow.xaml.cs        |  3 +--
 src/settings-ui/Settings.UI/Views/ShellPage.xaml      |  9 ++++++++-
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml b/src/settings-ui/Settings.UI/MainWindow.xaml
index bd924ed304..715a25863c 100644
--- 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
index 0ccafa42f2..06ce02f20d 100644
--- 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
index 425f37e234..73ec67abce 100644
--- 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
index 4eec95c05d..ee2da9598b 100644
--- a/src/settings-ui/Settings.UI/OobeWindow.xaml
+++ b/src/settings-ui/Settings.UI/OobeWindow.xaml
@@ -1,4 +1,4 @@
-<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"
@@ -6,14 +6,9 @@
     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
index 983f60e641..713e06be3d 100644
--- 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.Windowing;
 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
index 7f17494080..268b25dc15 100644
--- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/ShellPage.xaml
@@ -11,6 +11,10 @@
     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">
@@ -18,7 +22,10 @@
         </ic:EventTriggerBehavior>
     </i:Interaction.Behaviors>
 
-    <Grid x:Name="RootGrid">
+    <Grid
+        x:Name="RootGrid"
+        Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
         <NavigationView
             x:Name="navigationView"
             CompactModeThresholdWidth="1007"