Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 19:57:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

[File Explorer Add-ons] remove old settings support (#10857)

Browse Source
This commit is contained in:
Enrico Giordani
2021-04-21 03:16:01 -07:00
committed by GitHub
parent 6ec30e2186
commit 150ffe6013
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/utils/os-detect.h
View File

@@ -22,10 +22,3 @@ inline bool Is19H1OrHigher()
{ {
return IsAPIContractV8Available(); return IsAPIContractV8Available();
} }
// This function returns true if the build is 19h1 or higher, so that we deploy the new settings.
// It returns false otherwise.
inline bool UseNewSettings()
{
return Is19H1OrHigher();
}

18
src/modules/previewpane/powerpreview/powerpreview.cpp
View File

@@ -44,11 +44,9 @@ PowerPreviewModule::PowerPreviewModule() :
std::make_unique<RegistryWrapper>(), std::make_unique<RegistryWrapper>(),
L".svg\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}")); L".svg\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}"));
// If the user is on the new settings interface, File Explorer might be disabled if they updated from old to new settings, so initialize the registry state in the constructor as PowerPreviewModule::enable/disable will not be called on startup // File Explorer might be disabled if user updated from old to new settings.
if (UseNewSettings()) // Initialize the registry state in the constructor as PowerPreviewModule::enable/disable will not be called on startup
{ update_registry_to_match_toggles();
update_registry_to_match_toggles();
}
} }
// Destroy the powertoy and free memory. // Destroy the powertoy and free memory.
@@ -111,8 +109,8 @@ void PowerPreviewModule::set_config(const wchar_t* config)
bool isElevated = is_process_elevated(false); bool isElevated = is_process_elevated(false);
for (auto& fileExplorerModule : m_fileExplorerModules) for (auto& fileExplorerModule : m_fileExplorerModules)
{ {
// If the user is using the new settings interface, as it does not have a toggle to modify enabled consider File Explorer to always be enabled // The new settings interface does not have a toggle to modify enabled, consider File Explorer to always be enabled
updateSuccess = updateSuccess && fileExplorerModule->UpdateState(settings, this->m_enabled || UseNewSettings(), isElevated); updateSuccess = updateSuccess && fileExplorerModule->UpdateState(settings, true, isElevated);
} }
if (!updateSuccess) if (!updateSuccess)
@@ -131,12 +129,6 @@ void PowerPreviewModule::set_config(const wchar_t* config)
// Enable preview handlers. // Enable preview handlers.
void PowerPreviewModule::enable() void PowerPreviewModule::enable()
{ {
// Should only be done for old settings as it is already done for new settings in the constructor.
if (!UseNewSettings())
{
update_registry_to_match_toggles();
}
if (!this->m_enabled) if (!this->m_enabled)
{ {
Trace::EnabledPowerPreview(true); Trace::EnabledPowerPreview(true);