From 4291fa57f9001ed84ce5d6f90f992c77aa8b964f Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Tue, 14 Mar 2023 18:18:30 +0100 Subject: [PATCH] [Settings / OOBE] Adding Mica (#24327) * Adding Mica * Adding MinHeight --- 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, 21 insertions(+), 23 deletions(-) diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml b/src/settings-ui/Settings.UI/MainWindow.xaml index 715a25863c..bd924ed304 100644 --- a/src/settings-ui/Settings.UI/MainWindow.xaml +++ b/src/settings-ui/Settings.UI/MainWindow.xaml @@ -1,14 +1,19 @@ - - + + + - + diff --git a/src/settings-ui/Settings.UI/MainWindow.xaml.cs b/src/settings-ui/Settings.UI/MainWindow.xaml.cs index 06ce02f20d..0ccafa42f2 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 : Window + public sealed partial class MainWindow : WindowEx { 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 73ec67abce..425f37e234 100644 --- a/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml +++ b/src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml @@ -3,17 +3,11 @@ 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 713e06be3d..983f60e641 100644 --- a/src/settings-ui/Settings.UI/OobeWindow.xaml.cs +++ b/src/settings-ui/Settings.UI/OobeWindow.xaml.cs @@ -13,13 +13,14 @@ 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 : Window + public sealed partial class OobeWindow : WindowEx { private PowerToysModules initialModule; diff --git a/src/settings-ui/Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/Views/ShellPage.xaml index 268b25dc15..7f17494080 100644 --- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml +++ b/src/settings-ui/Settings.UI/Views/ShellPage.xaml @@ -11,10 +11,6 @@ xmlns:views="using:Microsoft.PowerToys.Settings.UI.Views" HighContrastAdjustment="None" mc:Ignorable="d"> - @@ -22,10 +18,7 @@ - - +