diff options
author | YuSanka <yusanka@gmail.com> | 2021-12-15 15:24:24 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2021-12-15 15:24:40 +0300 |
commit | ab245a97a47681371b51fc328f85eab200b1b93d (patch) | |
tree | e5012e2dda4c7eef344b6ff2bc1580cd8c4bc7b6 /src/slic3r/GUI | |
parent | 41fa4a05f9746c7fd14c100b5581a8a1d272ff55 (diff) |
Fix for #7496 - Dark-mode selection highlight
Diffstat (limited to 'src/slic3r/GUI')
-rw-r--r-- | src/slic3r/GUI/GUI_App.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 8f8b30d8b..66258452a 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1105,7 +1105,9 @@ bool GUI_App::on_init_inner() // If load_language() fails, the application closes. load_language(wxString(), true); #ifdef _MSW_DARK_MODE - NppDarkMode::InitDarkMode(app_config->get("dark_color_mode") == "1", app_config->get("sys_menu_enabled") == "1"); + bool init_dark_color_mode = app_config->get("dark_color_mode") == "1"; + bool init_sys_menu_enabled = app_config->get("sys_menu_enabled") == "1"; + NppDarkMode::InitDarkMode(init_dark_color_mode, init_sys_menu_enabled); #endif // initialize label colors and fonts init_label_colours(); @@ -1121,6 +1123,19 @@ bool GUI_App::on_init_inner() older_data_dir_path = check_older_app_config(Semver(), false); } +#ifdef _MSW_DARK_MODE + // app_config can be updated in check_older_app_config(), so check if dark_color_mode and sys_menu_enabled was changed + if (bool new_dark_color_mode = app_config->get("dark_color_mode") == "1"; + init_dark_color_mode != new_dark_color_mode) { + NppDarkMode::SetDarkMode(new_dark_color_mode); + init_label_colours(); + update_label_colours_from_appconfig(); + } + if (bool new_sys_menu_enabled = app_config->get("sys_menu_enabled") == "1"; + init_sys_menu_enabled != new_sys_menu_enabled) + NppDarkMode::SetSystemMenuForApp(new_sys_menu_enabled); +#endif + SplashScreen* scrn = nullptr; if (app_config->get("show_splash_screen") == "1") { // make a bitmap with dark grey banner on the left side |