mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 11:48:06 +01:00
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Added a new setting option to Command Palette that allows users to choose whether the window should be recentered on every launch or remember its last position. This enhancement improves user experience by maintaining window positioning preferences across sessions. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [x] **Closes:** #38310 - [x] **Communication:** I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end user facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments This PR adds a "Recenter window on launch" setting to Command Palette with the following changes: 1. Added a new `RecenterWindow` property to `SettingsModel` (default is true for backward compatibility) 2. Added corresponding property to `SettingsViewModel` for binding 3. Created a new `WindowPosition` class to track window position and size 4. Modified `MainWindow.xaml.cs` to: - Track window position and size changes - Update position memory when window is modified or dismissed - Respect the recenter setting when showing the window 5. Added UI controls in the settings page with proper localization strings  This feature allows users who prefer to have the Command Palette appear in a specific screen location to maintain that preference, while others can continue using the centered window behavior. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed 1. Manually verified that with the setting enabled (default), the window centers on launch 2. Verified that with the setting disabled, the window appears at its last position --------- Signed-off-by: Shawn Yuan <shuai.yuan.zju@gmail.com> Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com>
216 lines
7.4 KiB
C#
216 lines
7.4 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.Diagnostics;
|
|
using System.Text.Json;
|
|
using System.Text.Json.Nodes;
|
|
using System.Text.Json.Serialization;
|
|
using CommunityToolkit.Mvvm.ComponentModel;
|
|
using Microsoft.CmdPal.UI.ViewModels.Settings;
|
|
using Microsoft.CommandPalette.Extensions.Toolkit;
|
|
using Windows.Foundation;
|
|
|
|
namespace Microsoft.CmdPal.UI.ViewModels;
|
|
|
|
public partial class SettingsModel : ObservableObject
|
|
{
|
|
[JsonIgnore]
|
|
public static readonly string FilePath;
|
|
|
|
public event TypedEventHandler<SettingsModel, object?>? SettingsChanged;
|
|
|
|
///////////////////////////////////////////////////////////////////////////
|
|
// SETTINGS HERE
|
|
public static HotkeySettings DefaultActivationShortcut { get; } = new HotkeySettings(true, false, true, false, 0x20); // win+alt+space
|
|
|
|
public HotkeySettings? Hotkey { get; set; } = DefaultActivationShortcut;
|
|
|
|
public bool UseLowLevelGlobalHotkey { get; set; }
|
|
|
|
public bool ShowAppDetails { get; set; }
|
|
|
|
public bool HotkeyGoesHome { get; set; }
|
|
|
|
public bool BackspaceGoesBack { get; set; }
|
|
|
|
public bool SingleClickActivates { get; set; }
|
|
|
|
public bool HighlightSearchOnActivate { get; set; } = true;
|
|
|
|
public bool ShowSystemTrayIcon { get; set; } = true;
|
|
|
|
public bool IgnoreShortcutWhenFullscreen { get; set; }
|
|
|
|
public bool AllowExternalReload { get; set; }
|
|
|
|
public Dictionary<string, ProviderSettings> ProviderSettings { get; set; } = [];
|
|
|
|
public Dictionary<string, CommandAlias> Aliases { get; set; } = [];
|
|
|
|
public List<TopLevelHotkey> CommandHotkeys { get; set; } = [];
|
|
|
|
public MonitorBehavior SummonOn { get; set; } = MonitorBehavior.ToMouse;
|
|
|
|
public bool DisableAnimations { get; set; } = true;
|
|
|
|
public WindowPosition? LastWindowPosition { get; set; }
|
|
|
|
// END SETTINGS
|
|
///////////////////////////////////////////////////////////////////////////
|
|
|
|
static SettingsModel()
|
|
{
|
|
FilePath = SettingsJsonPath();
|
|
}
|
|
|
|
public ProviderSettings GetProviderSettings(CommandProviderWrapper provider)
|
|
{
|
|
ProviderSettings? settings;
|
|
if (!ProviderSettings.TryGetValue(provider.ProviderId, out settings))
|
|
{
|
|
settings = new ProviderSettings(provider);
|
|
settings.Connect(provider);
|
|
ProviderSettings[provider.ProviderId] = settings;
|
|
}
|
|
else
|
|
{
|
|
settings.Connect(provider);
|
|
}
|
|
|
|
return settings;
|
|
}
|
|
|
|
public static SettingsModel LoadSettings()
|
|
{
|
|
if (string.IsNullOrEmpty(FilePath))
|
|
{
|
|
throw new InvalidOperationException($"You must set a valid {nameof(SettingsModel.FilePath)} before calling {nameof(LoadSettings)}");
|
|
}
|
|
|
|
if (!File.Exists(FilePath))
|
|
{
|
|
Debug.WriteLine("The provided settings file does not exist");
|
|
return new();
|
|
}
|
|
|
|
try
|
|
{
|
|
// Read the JSON content from the file
|
|
var jsonContent = File.ReadAllText(FilePath);
|
|
|
|
var loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel);
|
|
|
|
Debug.WriteLine(loaded is not null ? "Loaded settings file" : "Failed to parse");
|
|
|
|
return loaded ?? new();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Debug.WriteLine(ex.ToString());
|
|
}
|
|
|
|
return new();
|
|
}
|
|
|
|
public static void SaveSettings(SettingsModel model)
|
|
{
|
|
if (string.IsNullOrEmpty(FilePath))
|
|
{
|
|
throw new InvalidOperationException($"You must set a valid {nameof(FilePath)} before calling {nameof(SaveSettings)}");
|
|
}
|
|
|
|
try
|
|
{
|
|
// Serialize the main dictionary to JSON and save it to the file
|
|
var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.SettingsModel);
|
|
|
|
// Is it valid JSON?
|
|
if (JsonNode.Parse(settingsJson) is JsonObject newSettings)
|
|
{
|
|
// Now, read the existing content from the file
|
|
var oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";
|
|
|
|
// Is it valid JSON?
|
|
if (JsonNode.Parse(oldContent) is JsonObject savedSettings)
|
|
{
|
|
foreach (var item in newSettings)
|
|
{
|
|
savedSettings[item.Key] = item.Value?.DeepClone();
|
|
}
|
|
|
|
var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.Options);
|
|
File.WriteAllText(FilePath, serialized);
|
|
|
|
// TODO: Instead of just raising the event here, we should
|
|
// have a file change watcher on the settings file, and
|
|
// reload the settings then
|
|
model.SettingsChanged?.Invoke(model, null);
|
|
}
|
|
else
|
|
{
|
|
Debug.WriteLine("Failed to parse settings file as JsonObject.");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Debug.WriteLine("Failed to parse settings file as JsonObject.");
|
|
}
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Debug.WriteLine(ex.ToString());
|
|
}
|
|
}
|
|
|
|
internal static string SettingsJsonPath()
|
|
{
|
|
var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
|
|
Directory.CreateDirectory(directory);
|
|
|
|
// now, the settings is just next to the exe
|
|
return Path.Combine(directory, "settings.json");
|
|
}
|
|
|
|
// [UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.", Justification = "<Pending>")]
|
|
// private static readonly JsonSerializerOptions _serializerOptions = new()
|
|
// {
|
|
// WriteIndented = true,
|
|
// Converters = { new JsonStringEnumConverter() },
|
|
// };
|
|
// private static readonly JsonSerializerOptions _deserializerOptions = new()
|
|
// {
|
|
// PropertyNameCaseInsensitive = true,
|
|
// IncludeFields = true,
|
|
// Converters = { new JsonStringEnumConverter() },
|
|
// AllowTrailingCommas = true,
|
|
// };
|
|
}
|
|
|
|
[JsonSerializable(typeof(float))]
|
|
[JsonSerializable(typeof(int))]
|
|
[JsonSerializable(typeof(string))]
|
|
[JsonSerializable(typeof(bool))]
|
|
[JsonSerializable(typeof(HistoryItem))]
|
|
[JsonSerializable(typeof(SettingsModel))]
|
|
[JsonSerializable(typeof(WindowPosition))]
|
|
[JsonSerializable(typeof(AppStateModel))]
|
|
[JsonSerializable(typeof(RecentCommandsManager))]
|
|
[JsonSerializable(typeof(List<string>), TypeInfoPropertyName = "StringList")]
|
|
[JsonSerializable(typeof(List<HistoryItem>), TypeInfoPropertyName = "HistoryList")]
|
|
[JsonSerializable(typeof(Dictionary<string, object>), TypeInfoPropertyName = "Dictionary")]
|
|
[JsonSourceGenerationOptions(UseStringEnumConverter = true, WriteIndented = true, IncludeFields = true, PropertyNameCaseInsensitive = true, AllowTrailingCommas = true)]
|
|
[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Just used here")]
|
|
internal sealed partial class JsonSerializationContext : JsonSerializerContext
|
|
{
|
|
}
|
|
|
|
public enum MonitorBehavior
|
|
{
|
|
ToMouse = 0,
|
|
ToPrimary = 1,
|
|
ToFocusedWindow = 2,
|
|
InPlace = 3,
|
|
ToLast = 4,
|
|
}
|