mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 17:56:44 +02:00
## Summary Fixes issue where multiple ShortcutConflictWindow instances could be opened simultaneously. The window now follows the same singleton pattern as OobeWindow - only one instance can exist at a time, and attempting to open another brings the existing window to the foreground. ## Changes Implemented singleton management for `ShortcutConflictWindow` following the established pattern used by `OobeWindow`: ### App.xaml.cs - Added static field to store the singleton window instance - Added `GetShortcutConflictWindow()`, `SetShortcutConflictWindow()`, and `ClearShortcutConflictWindow()` methods for lifecycle management ### ShortcutConflictWindow.xaml.cs - Updated `WindowEx_Closed` event handler to call `App.ClearShortcutConflictWindow()` to properly clean up the singleton reference when the window is closed ### Updated all three entry points that create ShortcutConflictWindow: - **ShortcutConflictControl.xaml.cs** (Dashboard conflict warning) - **ShortcutControl.xaml.cs** (Settings page shortcut controls) - **OobeOverview.xaml.cs** (OOBE overview page) Each location now checks if a window already exists using `App.GetShortcutConflictWindow()`: - If no window exists, creates a new one and registers it via `App.SetShortcutConflictWindow()` - If a window already exists, simply calls `Activate()` to bring it to the foreground ## Testing The fix ensures that: - ✅ Only one ShortcutConflictWindow can be open at a time - ✅ Clicking the shortcut conflict button when a window is already open activates the existing window instead of creating a duplicate - ✅ The window reference is properly cleared when closed, allowing a new instance to be created in future interactions Fixes #[issue_number] > [!WARNING] > > <details> > <summary>Firewall rules blocked me from connecting to one or more addresses (expand for details)</summary> > > #### I tried to connect to the following addresses, but was blocked by firewall rules: > > - `i1qvsblobprodcus353.vsblob.vsassets.io` > - Triggering command: `dotnet build PowerToys.Settings.csproj --configuration Release` (dns block) > > If you need me to access, download, or install something from one of these locations, you can either: > > - Configure [Actions setup steps](https://gh.io/copilot/actions-setup-steps) to set up my environment, which run before the firewall is enabled > - Add the appropriate URLs or hosts to the custom allowlist in this repository's [Copilot coding agent settings](https://github.com/microsoft/PowerToys/settings/copilot/coding_agent) (admins only) > > </details> <!-- START COPILOT CODING AGENT SUFFIX --> <details> <summary>Original prompt</summary> > > ---- > > *This section details on the original issue you should resolve* > > <issue_title>[Settings] Single Shortcuts Conflicts window</issue_title> > <issue_description>### Microsoft PowerToys version > > 0.95.0 > > ### Installation method > > GitHub > > ### Area(s) with issue? > > Settings > > ### Steps to reproduce > > Multiple shortcut conflicts window can be launched. > Should have the same behavior of OOBE window. > If shortcut conflicts window is already opened, pressing the button should bring the window in foreground. > > ### ✔️ Expected Behavior > > Single shortcuts conflicts window > > ### ❌ Actual Behavior > > Multiple shortcut conflicts window can be launched > > ### Additional Information > > _No response_ > > ### Other Software > > _No response_</issue_description> > > <agent_instructions>Settings ShortcutConflictWindow should have the same behavior of OobeWindow. > When ShortcutConflictWindow is already opened, activate that window instead of opening another one. </agent_instructions> > > ## Comments on the Issue (you are @copilot in this section) > > <comments> > </comments> > </details> Fixes microsoft/PowerToys#42437 <!-- START COPILOT CODING AGENT TIPS --> --- 💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click [here](https://survey3.medallia.com/?EAHeSx-AP01bZqG0Ld9QLQ) to start the survey. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: davidegiacometti <25966642+davidegiacometti@users.noreply.github.com> Co-authored-by: Davide Giacometti <davide.giacometti@outlook.it> Co-authored-by: Niels Laute <niels.laute@live.nl> Co-authored-by: vanzue <vanzue@outlook.com>
206 lines
7.1 KiB
C#
206 lines
7.1 KiB
C#
// Copyright (c) Microsoft Corporation
|
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
|
// See the LICENSE file in the project root for more information.
|
|
|
|
using System;
|
|
using System.Threading.Tasks;
|
|
using ManagedCommon;
|
|
using Microsoft.PowerLauncher.Telemetry;
|
|
using Microsoft.PowerToys.Settings.UI.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Library;
|
|
using Microsoft.PowerToys.Settings.UI.Library.Helpers;
|
|
using Microsoft.PowerToys.Settings.UI.Views;
|
|
using Microsoft.PowerToys.Telemetry;
|
|
using Microsoft.UI;
|
|
using Microsoft.UI.Dispatching;
|
|
using Microsoft.UI.Windowing;
|
|
using Microsoft.UI.Xaml;
|
|
using Windows.Data.Json;
|
|
using WinRT.Interop;
|
|
using WinUIEx;
|
|
|
|
namespace Microsoft.PowerToys.Settings.UI
|
|
{
|
|
public sealed partial class MainWindow : WindowEx
|
|
{
|
|
public MainWindow(bool createHidden = false)
|
|
{
|
|
var bootTime = new System.Diagnostics.Stopwatch();
|
|
bootTime.Start();
|
|
|
|
this.Activated += Window_Activated_SetIcon;
|
|
|
|
App.ThemeService.ThemeChanged += OnThemeChanged;
|
|
App.ThemeService.ApplyTheme();
|
|
|
|
this.ExtendsContentIntoTitleBar = true;
|
|
|
|
ShellPage.SetElevationStatus(App.IsElevated);
|
|
ShellPage.SetIsUserAnAdmin(App.IsUserAnAdmin);
|
|
|
|
var hWnd = WindowNative.GetWindowHandle(this);
|
|
var placement = WindowHelper.DeserializePlacementOrDefault(hWnd);
|
|
if (createHidden)
|
|
{
|
|
placement.ShowCmd = NativeMethods.SW_HIDE;
|
|
|
|
// Restore the last known placement on the first activation
|
|
this.Activated += Window_Activated;
|
|
}
|
|
|
|
NativeMethods.SetWindowPlacement(hWnd, ref placement);
|
|
|
|
var loader = ResourceLoaderInstance.ResourceLoader;
|
|
Title = App.IsElevated ? loader.GetString("SettingsWindow_AdminTitle") : loader.GetString("SettingsWindow_Title");
|
|
|
|
// send IPC Message
|
|
ShellPage.SetDefaultSndMessageCallback(msg =>
|
|
{
|
|
// IPC Manager is null when launching runner directly
|
|
App.GetTwoWayIPCManager()?.Send(msg);
|
|
});
|
|
|
|
// send IPC Message
|
|
ShellPage.SetRestartAdminSndMessageCallback(msg =>
|
|
{
|
|
App.GetTwoWayIPCManager()?.Send(msg);
|
|
Environment.Exit(0); // close application
|
|
});
|
|
|
|
// send IPC Message
|
|
ShellPage.SetCheckForUpdatesMessageCallback(msg =>
|
|
{
|
|
App.GetTwoWayIPCManager()?.Send(msg);
|
|
});
|
|
|
|
// open main window
|
|
ShellPage.SetOpenMainWindowCallback(type =>
|
|
{
|
|
DispatcherQueue.TryEnqueue(DispatcherQueuePriority.Normal, () =>
|
|
App.OpenSettingsWindow(type));
|
|
});
|
|
|
|
// open main window
|
|
ShellPage.SetUpdatingGeneralSettingsCallback((ModuleType moduleType, bool isEnabled) =>
|
|
{
|
|
SettingsRepository<GeneralSettings> repository = SettingsRepository<GeneralSettings>.GetInstance(SettingsUtils.Default);
|
|
GeneralSettings generalSettingsConfig = repository.SettingsConfig;
|
|
bool needToUpdate = ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType) != isEnabled;
|
|
|
|
if (needToUpdate)
|
|
{
|
|
ModuleHelper.SetIsModuleEnabled(generalSettingsConfig, moduleType, isEnabled);
|
|
var outgoing = new OutGoingGeneralSettings(generalSettingsConfig);
|
|
|
|
// Save settings to file
|
|
SettingsUtils.Default.SaveSettings(generalSettingsConfig.ToJsonString());
|
|
|
|
// Send IPC message asynchronously to avoid blocking UI and potential recursive calls
|
|
Task.Run(() =>
|
|
{
|
|
ShellPage.SendDefaultIPCMessage(outgoing.ToString());
|
|
});
|
|
|
|
ShellPage.ShellHandler?.SignalGeneralDataUpdate();
|
|
}
|
|
|
|
return needToUpdate;
|
|
});
|
|
|
|
this.InitializeComponent();
|
|
SetTitleBar();
|
|
|
|
// receive IPC Message
|
|
App.IPCMessageReceivedCallback = (string msg) =>
|
|
{
|
|
if (ShellPage.ShellHandler.IPCResponseHandleList != null)
|
|
{
|
|
var success = JsonObject.TryParse(msg, out JsonObject json);
|
|
if (success)
|
|
{
|
|
foreach (Action<JsonObject> handle in ShellPage.ShellHandler.IPCResponseHandleList)
|
|
{
|
|
handle(json);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Logger.LogError("Failed to parse JSON from IPC message.");
|
|
}
|
|
}
|
|
};
|
|
|
|
bootTime.Stop();
|
|
|
|
PowerToysTelemetry.Log.WriteEvent(new SettingsBootEvent() { BootTimeMs = bootTime.ElapsedMilliseconds });
|
|
}
|
|
|
|
private void SetTitleBar()
|
|
{
|
|
// We need to assign the window here so it can configure the custom title bar area correctly.
|
|
shellPage.TitleBar.Window = this;
|
|
this.ExtendsContentIntoTitleBar = true;
|
|
WindowHelpers.ForceTopBorder1PixelInsetOnWindows10(WindowNative.GetWindowHandle(this));
|
|
}
|
|
|
|
public void NavigateToSection(Type type)
|
|
{
|
|
ShellPage.Navigate(type);
|
|
}
|
|
|
|
public void CloseHiddenWindow()
|
|
{
|
|
var hWnd = WindowNative.GetWindowHandle(this);
|
|
if (!NativeMethods.IsWindowVisible(hWnd))
|
|
{
|
|
Close();
|
|
}
|
|
}
|
|
|
|
private void Window_Closed(object sender, WindowEventArgs args)
|
|
{
|
|
var hWnd = WindowNative.GetWindowHandle(this);
|
|
WindowHelper.SerializePlacement(hWnd);
|
|
|
|
if (!App.IsSecondaryWindowOpen())
|
|
{
|
|
App.ClearSettingsWindow();
|
|
}
|
|
else
|
|
{
|
|
args.Handled = true;
|
|
NativeMethods.ShowWindow(hWnd, NativeMethods.SW_HIDE);
|
|
}
|
|
|
|
App.ThemeService.ThemeChanged -= OnThemeChanged;
|
|
}
|
|
|
|
private void Window_Activated_SetIcon(object sender, WindowActivatedEventArgs args)
|
|
{
|
|
// Set window icon
|
|
this.SetIcon("Assets\\Settings\\icon.ico");
|
|
}
|
|
|
|
private void Window_Activated(object sender, WindowActivatedEventArgs args)
|
|
{
|
|
if (args.WindowActivationState != WindowActivationState.Deactivated)
|
|
{
|
|
this.Activated -= Window_Activated;
|
|
var hWnd = WindowNative.GetWindowHandle(this);
|
|
var placement = WindowHelper.DeserializePlacementOrDefault(hWnd);
|
|
NativeMethods.SetWindowPlacement(hWnd, ref placement);
|
|
}
|
|
}
|
|
|
|
private void OnThemeChanged(object sender, ElementTheme theme)
|
|
{
|
|
WindowHelper.SetTheme(this, theme);
|
|
}
|
|
|
|
internal void EnsurePageIsSelected()
|
|
{
|
|
ShellPage.EnsurePageIsSelected();
|
|
}
|
|
}
|
|
}
|