Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve wxGenericTreeCtrl colours/fonts updating on theme change

Browse Source 
Don't override user-specified colours neither, previously we only did it
for the font for some reason.

Also do override the colours and the font when the theme changes, which
didn't happen after the previous commit because calling SetOwnXXX()
changes m_hasXXX to true, so we need to explicitly reset it back.
This commit is contained in:
Vadim Zeitlin
2020-07-14 17:34:24 +02:00
parent 8535cde836
commit 9cd3ab5ebd
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/generic/treectlg.cpp
View File

@@ -1007,11 +1007,30 @@ void wxGenericTreeCtrl::EnableBellOnNoMatch( bool on )
void wxGenericTreeCtrl::InitVisualAttributes()
{
// We want to use the default system colours/fonts here unless the user
// explicitly configured something different. We also need to reset the
// various m_hasXXX variables to false to prevent them from being left set
// to "true", as otherwise we wouldn't update the colours/fonts the next
// time the system colours change.
const wxVisualAttributes attr(GetDefaultAttributes());
SetOwnForegroundColour(attr.colFg);
SetOwnBackgroundColour(attr.colBg);
if (!m_hasFont)
if ( !m_hasFgCol )
{
SetOwnForegroundColour(attr.colFg);
m_hasFgCol = false;
}
if ( !m_hasBgCol )
{
SetOwnBackgroundColour(attr.colBg);
m_hasBgCol = false;
}
if ( !m_hasFont )
{
SetOwnFont(attr.font);
m_hasFont = false;
}
m_hilightBrush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
m_hilightUnfocusedBrush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));