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 @@ - - - - + - + 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 /// /// An empty window that can be used on its own or navigated to within a Frame. /// - 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"> - + + - - - + - + 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 { /// /// An empty window that can be used on its own or navigated to within a Frame. /// - 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"> + @@ -18,7 +22,10 @@ - + +