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

Merge latest master: 4/22/20

Browse Source
This commit is contained in:
Arjun
2020-04-22 10:02:17 -07:00
parent d079f0ca44 48d744b6bd
commit ca3a436fe5
67 changed files with 7482 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/runner/settings_window.cpp
View File

@@ -40,7 +40,7 @@ json::JsonObject get_all_settings()
{
json::JsonObject result;
result.SetNamedValue(L"general", get_general_settings());
result.SetNamedValue(L"general", get_general_settings().to_json());
result.SetNamedValue(L"powertoys", get_power_toys_settings());
return result;
}
@@ -243,7 +243,7 @@ void run_settings_window()
DWORD powertoys_pid = GetCurrentProcessId();
// Arg 4: settings theme.
const std::wstring settings_theme_setting{ get_general_settings().GetNamedString(L"theme").c_str() };
const std::wstring settings_theme_setting{ get_general_settings().theme };
std::wstring settings_theme;
if (settings_theme_setting == L"dark" || (settings_theme_setting == L"system" && WindowsColors::is_dark_mode()))
{