mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-09-02 07:25:10 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Hide main settings window instead of closing (#17960)

Browse Source 
* Hide main settings window instead of closing

* Proper closing

* Create Settings window hidden if opening OOBE/SCOOBE
This commit is contained in:
Stefan Markovic
2022-05-19 15:12:59 +02:00
committed by GitHub
parent ab4328310c
commit 88e79ac669
4 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/settings-ui/Settings.UI/MainWindow.xaml.cs
View File

@@ -22,7 +22,7 @@ namespace Microsoft.PowerToys.Settings.UI
/// </summary>
public sealed partial class MainWindow : Window
{
public MainWindow()
public MainWindow(bool createHidden = false)
{
var bootTime = new System.Diagnostics.Stopwatch();
bootTime.Start();
@@ -37,6 +37,11 @@ namespace Microsoft.PowerToys.Settings.UI
appWindow.SetIcon("icon.ico");
var placement = Utils.DeserializePlacementOrDefault(hWnd);
if (createHidden)
{
placement.ShowCmd = NativeMethods.SW_HIDE;
}
NativeMethods.SetWindowPlacement(hWnd, ref placement);
ResourceLoader loader = ResourceLoader.GetForViewIndependentUse();
@@ -105,12 +110,29 @@ namespace Microsoft.PowerToys.Settings.UI
ShellPage.Navigate(type);
}
public void CloseHiddenWindow()
{
var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
if (!NativeMethods.IsWindowVisible(hWnd))
{
Close();
}
}
private void Window_Closed(object sender, WindowEventArgs args)
{
App.ClearSettingsWindow();
var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
Utils.SerializePlacement(hWnd);
if (App.GetOobeWindow() == null)
{
App.ClearSettingsWindow();
}
else
{
args.Handled = true;
NativeMethods.ShowWindow(hWnd, NativeMethods.SW_HIDE);
}
}
}
}