mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 17:56:44 +02:00
Regressed in one of the #40113 prs. The Core.VM.PageViewModelFactory didn't actually know how to make a ContentPage, because Core can't handle a FormContent. But really, the CommandSettingsViewModel shouldn't have ever been in the .Core namespace, nor should it have used the ContentPageViewModel. To prevent future mistakes like this, * I got rid of `Core.ViewModels/PageViewModelFactory`, cause we didn't need it. * I made `ContentPageViewModel` abstract, to prevent you from trying to instantiate it Closes #40778
62 lines
1.8 KiB
C#
62 lines
1.8 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 ManagedCommon;
|
|
using Microsoft.CmdPal.Core.ViewModels;
|
|
using Microsoft.CmdPal.Core.ViewModels.Models;
|
|
using Microsoft.CommandPalette.Extensions;
|
|
|
|
namespace Microsoft.CmdPal.UI.ViewModels;
|
|
|
|
public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings, CommandProviderWrapper provider, TaskScheduler mainThread)
|
|
{
|
|
private readonly ExtensionObject<ICommandSettings> _model = new(_unsafeSettings);
|
|
|
|
public ContentPageViewModel? SettingsPage { get; private set; }
|
|
|
|
public bool Initialized { get; private set; }
|
|
|
|
public bool HasSettings =>
|
|
_model.Unsafe != null && // We have a settings model AND
|
|
(!Initialized || SettingsPage != null); // we weren't initialized, OR we were, and we do have a settings page
|
|
|
|
private void UnsafeInitializeProperties()
|
|
{
|
|
var model = _model.Unsafe;
|
|
if (model == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (model.SettingsPage != null)
|
|
{
|
|
SettingsPage = new CommandPaletteContentPageViewModel(model.SettingsPage, mainThread, provider.ExtensionHost);
|
|
SettingsPage.InitializeProperties();
|
|
}
|
|
}
|
|
|
|
public void SafeInitializeProperties()
|
|
{
|
|
try
|
|
{
|
|
UnsafeInitializeProperties();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Logger.LogError($"Failed to load settings page", ex: ex);
|
|
}
|
|
|
|
Initialized = true;
|
|
}
|
|
|
|
public void DoOnUiThread(Action action)
|
|
{
|
|
Task.Factory.StartNew(
|
|
action,
|
|
CancellationToken.None,
|
|
TaskCreationOptions.None,
|
|
mainThread);
|
|
}
|
|
}
|