amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

FIX: [STUDIO-1563] dark mode of dataview's header

Browse source 
Change-Id: Ied9358df9d2edd9f0d40a81694655b8f2fdefdb8
This commit is contained in:
chunmao.guo 2022-12-06 18:52:57 +08:00 committed by Lane.Wei
parent 0db1b52b23
commit e54f3a75d4
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/GUI_App.cpp
View file

@ -102,6 +102,8 @@
#ifdef __WINDOWS__ #ifdef __WINDOWS__
#ifdef _MSW_DARK_MODE #ifdef _MSW_DARK_MODE
#include "dark_mode.hpp" #include "dark_mode.hpp"
#include "wx/headerctrl.h"
#include "wx/msw/headerctrl.h"
#endif // _MSW_DARK_MODE #endif // _MSW_DARK_MODE
#endif // __WINDOWS__ #endif // __WINDOWS__
@ -2801,6 +2803,14 @@ void GUI_App::UpdateDVCDarkUI(wxDataViewCtrl* dvc, bool highlited/* = false*/)
UpdateDarkUI(dvc, highlited ? dark_mode() : false); UpdateDarkUI(dvc, highlited ? dark_mode() : false);
#ifdef _MSW_DARK_MODE #ifdef _MSW_DARK_MODE
//dvc->RefreshHeaderDarkMode(&m_normal_font); //dvc->RefreshHeaderDarkMode(&m_normal_font);
HWND hwnd = (HWND)dvc->GenericGetHeader()->GetHandle();
hwnd = GetWindow(hwnd, GW_CHILD);
if (hwnd != NULL)
NppDarkMode::SetDarkListViewHeader(hwnd);
wxItemAttr attr;
attr.SetTextColour(NppDarkMode::GetTextColor());
attr.SetFont(m_normal_font);
dvc->SetHeaderAttr(attr);
#endif //_MSW_DARK_MODE #endif //_MSW_DARK_MODE
if (dvc->HasFlag(wxDV_ROW_LINES)) if (dvc->HasFlag(wxDV_ROW_LINES))
dvc->SetAlternateRowColour(m_color_highlight_default); dvc->SetAlternateRowColour(m_color_highlight_default);

2
src/slic3r/GUI/Plater.cpp
View file

@ -1208,7 +1208,7 @@ void Sidebar::sys_color_changed()
combo->sys_color_changed(); combo->sys_color_changed();
// BBS // BBS
//obj_list()->sys_color_changed(); obj_list()->sys_color_changed();
// BBS // BBS
//p->object_manipulation->sys_color_changed(); //p->object_manipulation->sys_color_changed();

2
src/slic3r/GUI/Preferences.cpp
View file

@ -513,6 +513,8 @@ void PreferencesDialog::set_dark_mode()
NppDarkMode::SetDarkExplorerTheme(this->GetHWND()); NppDarkMode::SetDarkExplorerTheme(this->GetHWND());
NppDarkMode::SetDarkTitleBar(this->GetHWND()); NppDarkMode::SetDarkTitleBar(this->GetHWND());
wxGetApp().UpdateDlgDarkUI(this); wxGetApp().UpdateDlgDarkUI(this);
SetActiveWindow(wxGetApp().mainframe->GetHWND());
SetActiveWindow(GetHWND());
#endif #endif
#endif #endif
} }