From 5ebf4dcb481dff51481909de4b683437b7e0963d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 27 Jun 2025 15:06:01 +0000 Subject: [PATCH 1/2] Initial plan From e6bdf00a19a65ae15f5f3064a0c61d88e4afd23a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 27 Jun 2025 15:11:59 +0000 Subject: [PATCH 2/2] Fix per-user preview pane by using actual installation scope detection Co-authored-by: lei9444 <39758135+lei9444@users.noreply.github.com> --- src/common/utils/modulesRegistry.h | 4 ++-- src/modules/previewpane/powerpreview/powerpreview.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/utils/modulesRegistry.h b/src/common/utils/modulesRegistry.h index 8b957bd5b954..49b35173df79 100644 --- a/src/common/utils/modulesRegistry.h +++ b/src/common/utils/modulesRegistry.h @@ -270,7 +270,7 @@ inline registry::ChangeSet getRegistryPreviewChangeSet(const std::wstring instal inline std::vector getAllOnByDefaultModulesChangeSets(const std::wstring installationDir) { - constexpr bool PER_USER = true; + const bool PER_USER = (registry::install_scope::get_current_install_scope() == registry::install_scope::InstallScope::PerUser); return { getSvgPreviewHandlerChangeSet(installationDir, PER_USER), getMdPreviewHandlerChangeSet(installationDir, PER_USER), getMonacoPreviewHandlerChangeSet(installationDir, PER_USER), @@ -285,7 +285,7 @@ inline std::vector getAllOnByDefaultModulesChangeSets(const inline std::vector getAllModulesChangeSets(const std::wstring installationDir) { - constexpr bool PER_USER = true; + const bool PER_USER = (registry::install_scope::get_current_install_scope() == registry::install_scope::InstallScope::PerUser); return { getSvgPreviewHandlerChangeSet(installationDir, PER_USER), getMdPreviewHandlerChangeSet(installationDir, PER_USER), getMonacoPreviewHandlerChangeSet(installationDir, PER_USER), diff --git a/src/modules/previewpane/powerpreview/powerpreview.cpp b/src/modules/previewpane/powerpreview/powerpreview.cpp index 84d2a590dc3a..edbed16cb316 100644 --- a/src/modules/previewpane/powerpreview/powerpreview.cpp +++ b/src/modules/previewpane/powerpreview/powerpreview.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -24,7 +25,7 @@ PowerPreviewModule::PowerPreviewModule() : Logger::init(LogSettings::fileExplorerLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location()); Logger::info("Initializing PowerPreviewModule"); - const bool installPerUser = true; + const bool installPerUser = (registry::install_scope::get_current_install_scope() == registry::install_scope::InstallScope::PerUser); m_fileExplorerModules.push_back({ .settingName = L"svg-previewer-toggle-setting", .settingDescription = GET_RESOURCE_STRING(IDS_PREVPANE_SVG_SETTINGS_DESCRIPTION), .checkModuleGPOEnabledRuleFunction = powertoys_gpo::getConfiguredSvgPreviewEnabledValue,