From 8e41e6cee28c5936d932c8ed75c1c250f970aa79 Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 23 May 2023 15:33:59 +0800 Subject: [PATCH] FIX:supports dark mode on linux systems Change-Id: I424f4a686ffe0d25075022b7e58c89d2683fcea2 --- src/slic3r/GUI/GUI_App.cpp | 2 +- src/slic3r/GUI/MainFrame.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index a84be1d9c..0bcd3e867 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2354,7 +2354,7 @@ bool GUI_App::on_init_inner() load_language(wxString(), true); #ifdef _MSW_DARK_MODE -#ifdef __APPLE__ +#ifndef __WINDOWS__ wxSystemAppearance app = wxSystemSettings::GetAppearance(); GUI::wxGetApp().app_config->set("dark_color_mode", app.IsDark() ? "1" : "0"); GUI::wxGetApp().app_config->save(); diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index b8bc3baa7..2fc11cc1e 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1876,7 +1876,7 @@ void MainFrame::on_sys_color_changed() // update label colors in respect to the system mode wxGetApp().init_label_colours(); -#ifdef __APPLE__ +#ifndef __WINDOWS__ wxGetApp().force_colors_update(); wxGetApp().update_ui_from_settings(); #endif //__APPLE__ @@ -1898,7 +1898,6 @@ void MainFrame::on_sys_color_changed() // update Plater wxGetApp().plater()->sys_color_changed(); m_monitor->on_sys_color_changed(); - // update Tabs for (auto tab : wxGetApp().tabs_list) tab->sys_color_changed();