Skip to content

Commit

Permalink
Merge pull request #3 from microsoft/master
Browse files Browse the repository at this point in the history
Sync latest changes
  • Loading branch information
dend authored Apr 23, 2021
2 parents 849c376 + 3f3494a commit 3d35f2c
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 36 deletions.
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: "⭐ Feature / enhancement request"
description: Propose something new.
labels:
- Triage-Needed
body:
- type: textarea
attributes:
label: Provide a description of the new feature / enhancement
placeholder: |
What is the expected behavior of the proposed feature?
What is the scenario this would be used?
validations:
required: true
- type: markdown
attributes:
value: |
Please limit one request per issue.
7 changes: 0 additions & 7 deletions src/common/utils/os-detect.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,3 @@ inline bool Is19H1OrHigher()
{
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 changes: 5 additions & 13 deletions src/modules/previewpane/powerpreview/powerpreview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,9 @@ PowerPreviewModule::PowerPreviewModule() :
std::make_unique<RegistryWrapper>(),
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
if (UseNewSettings())
{
update_registry_to_match_toggles();
}
// File Explorer might be disabled if user updated from old to new settings.
// Initialize the registry state in the constructor as PowerPreviewModule::enable/disable will not be called on startup
update_registry_to_match_toggles();
}

// Destroy the powertoy and free memory.
Expand Down Expand Up @@ -111,8 +109,8 @@ void PowerPreviewModule::set_config(const wchar_t* config)
bool isElevated = is_process_elevated(false);
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
updateSuccess = updateSuccess && fileExplorerModule->UpdateState(settings, this->m_enabled || UseNewSettings(), isElevated);
// The new settings interface does not have a toggle to modify enabled, consider File Explorer to always be enabled
updateSuccess = updateSuccess && fileExplorerModule->UpdateState(settings, true, isElevated);
}

if (!updateSuccess)
Expand All @@ -131,12 +129,6 @@ void PowerPreviewModule::set_config(const wchar_t* config)
// Enable preview handlers.
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)
{
Trace::EnabledPowerPreview(true);
Expand Down

0 comments on commit 3d35f2c

Please sign in to comment.