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

This reverts commit 4291fa57f9.
This commit is contained in:
Niels Laute
2023-03-17 23:25:14 +01:00
committed by GitHub
parent 41997eb599
commit 7d4e804cec
6 changed files with 23 additions and 21 deletions

View File

@@ -1,19 +1,14 @@
<winuiex:WindowEx <Window
x:Class="Microsoft.PowerToys.Settings.UI.MainWindow" x:Class="Microsoft.PowerToys.Settings.UI.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views" xmlns:local="using:Microsoft.PowerToys.Settings.UI.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:winuiex="using:WinUIEx"
MinWidth="480"
MinHeight="480"
Closed="Window_Closed" Closed="Window_Closed"
mc:Ignorable="d"> mc:Ignorable="d">
<winuiex:WindowEx.Backdrop>
<winuiex:MicaSystemBackdrop />
</winuiex:WindowEx.Backdrop>
<Grid> <Grid>
<local:ShellPage /> <local:ShellPage />
</Grid> </Grid>
</winuiex:WindowEx> </Window>

View File

@@ -22,7 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI
/// <summary> /// <summary>
/// An empty window that can be used on its own or navigated to within a Frame. /// An empty window that can be used on its own or navigated to within a Frame.
/// </summary> /// </summary>
public sealed partial class MainWindow : WindowEx public sealed partial class MainWindow : Window
{ {
public MainWindow(bool isDark, bool createHidden = false) public MainWindow(bool isDark, bool createHidden = false)
{ {

View File

@@ -3,11 +3,17 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="using:CommunityToolkit.WinUI.UI" xmlns:ui="using:CommunityToolkit.WinUI.UI"
HighContrastAdjustment="None" HighContrastAdjustment="None"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid> <!--
todo(Stefan):
BackdropMaterial.ApplyToRootOrPageBackground="True"
-->
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<NavigationView <NavigationView
x:Name="NavigationView" x:Name="NavigationView"
IsBackButtonVisible="Collapsed" IsBackButtonVisible="Collapsed"

View File

@@ -1,4 +1,4 @@
<winuiex:WindowEx <Window
x:Class="Microsoft.PowerToys.Settings.UI.OobeWindow" x:Class="Microsoft.PowerToys.Settings.UI.OobeWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -6,14 +6,9 @@
xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views" xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Closed="Window_Closed" Closed="Window_Closed"
MinWidth="480"
MinHeight="480"
xmlns:winuiex="using:WinUIEx"
mc:Ignorable="d"> mc:Ignorable="d">
<winuiex:WindowEx.Backdrop>
<winuiex:MicaSystemBackdrop/>
</winuiex:WindowEx.Backdrop>
<Grid> <Grid>
<local:OobeShellPage x:Name="shellPage" /> <local:OobeShellPage x:Name="shellPage" />
</Grid> </Grid>
</winuiex:WindowEx> </Window>

View File

@@ -13,14 +13,13 @@ using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Windows.ApplicationModel.Resources; using Windows.ApplicationModel.Resources;
using Windows.Graphics; using Windows.Graphics;
using WinUIEx;
namespace Microsoft.PowerToys.Settings.UI namespace Microsoft.PowerToys.Settings.UI
{ {
/// <summary> /// <summary>
/// An empty window that can be used on its own or navigated to within a Frame. /// An empty window that can be used on its own or navigated to within a Frame.
/// </summary> /// </summary>
public sealed partial class OobeWindow : WindowEx public sealed partial class OobeWindow : Window
{ {
private PowerToysModules initialModule; private PowerToysModules initialModule;

View File

@@ -11,6 +11,10 @@
xmlns:views="using:Microsoft.PowerToys.Settings.UI.Views" xmlns:views="using:Microsoft.PowerToys.Settings.UI.Views"
HighContrastAdjustment="None" HighContrastAdjustment="None"
mc:Ignorable="d"> mc:Ignorable="d">
<!--
TODO(stefan): Bring back Should be available in v1.1
BackdropMaterial.ApplyToRootOrPageBackground="True"
-->
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<ic:EventTriggerBehavior EventName="Loaded"> <ic:EventTriggerBehavior EventName="Loaded">
@@ -18,7 +22,10 @@
</ic:EventTriggerBehavior> </ic:EventTriggerBehavior>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Grid x:Name="RootGrid"> <Grid
x:Name="RootGrid"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<NavigationView <NavigationView
x:Name="navigationView" x:Name="navigationView"
CompactModeThresholdWidth="1007" CompactModeThresholdWidth="1007"