Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[VCM]disable by default and admin warning (#14686)

Browse Source 
* Adding in InfoBar warning when not running as admin

* small newline text shift

* rolling out a text fix i didn't mean to commit

* defaulting to off, there are other spots is seems like

* [Runner] introduce is_enabled_by_default method and keep VCM disabled by default

* getting file back in good state

Co-authored-by: yuyoyuppe <a.yuyoyuppe@gmail.com>
This commit is contained in:
Clint Rutkas
2021-12-07 05:50:04 -08:00
committed by GitHub
parent aa376a2c0d
commit 71380d6fb1
9 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/runner/general_settings.cpp
View File

@@ -179,9 +179,15 @@ void apply_general_settings(const json::JsonObject& general_configs, bool save)
}
}
void start_initial_powertoys()
void start_enabled_powertoys()
{
std::unordered_set<std::wstring> powertoys_to_disable;
// Take into account default values supplied by modules themselves
for (auto& [name, powertoy] : modules())
{
if (!powertoy->is_enabled_by_default())
powertoys_to_disable.emplace(name);
}
json::JsonObject general_settings;
try
@@ -192,9 +198,16 @@ void start_initial_powertoys()
json::JsonObject enabled = general_settings.GetNamedObject(L"enabled");
for (const auto& disabled_element : enabled)
{
std::wstring disable_module_name{ static_cast<std::wstring_view>(disabled_element.Key()) };
// Disable explicitly disabled modules
if (!disabled_element.Value().GetBoolean())
{
powertoys_to_disable.emplace(disabled_element.Key());
powertoys_to_disable.emplace(std::move(disable_module_name));
}
// If module was scheduled for disable, but it's enabled in the settings - override default value
else if (auto it = powertoys_to_disable.find(disable_module_name); it != end(powertoys_to_disable))
{
powertoys_to_disable.erase(it);
}
}
}
@@ -203,21 +216,11 @@ void start_initial_powertoys()
{
}
if (powertoys_to_disable.empty())
for (auto& [name, powertoy] : modules())
{
for (auto& [name, powertoy] : modules())
if (!powertoys_to_disable.contains(name))
{
powertoy->enable();
}
}
else
{
for (auto& [name, powertoy] : modules())
{
if (powertoys_to_disable.find(name) == powertoys_to_disable.end())
{
powertoy->enable();
}
}
}
}