Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 17:02:51 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Handle system colour change in wxInfoBarGeneric

Browse Source 
Move colour settings from Create() into a new function UpdateColours(),
which gets called from Create() and also upon system colour change.

Closes #26633.
This commit is contained in:
Steve Cornett
2026-06-27 19:28:04 +02:00
committed by Vadim Zeitlin
parent d2c579305c
commit f26f253694
2 changed files with 52 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/wx/generic/infobar.h
+2
View File
@@ -134,6 +134,8 @@ private:
BarPlacement GetBarPlacement() const;
void UpdateColours();
void OnSysColourChanged(wxSysColourChangedEvent& event);
// different controls making up the bar
wxStaticBitmap *m_icon = nullptr;
src/generic/infobar.cpp
+50 -35
View File
@@ -75,36 +75,6 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid, long style)
if ( !wxWindow::Create(parent, winid, wxDefaultPosition, wxDefaultSize, style) )
return false;
// use special, easy to notice, colours
wxColour colBg, colFg;
if ( !m_hasBgCol && !m_hasFgCol )
{
// We want to use the native infobar colours for consistency with the
// native implementation under GTK, but only do it for 3.24, as both
// the CSS structure and the default colour values have changed in this
// version compared to all the previous ones and it seems safer to keep
// the old behaviour for the older GTK versions, see #25048.
#ifdef __WXGTK3__
if ( wx_is_at_least_gtk3(24) )
{
wxGtkStyleContext sc;
sc.Add(GTK_TYPE_INFO_BAR, "infobar", "info", nullptr);
sc.Add("revealer");
sc.Add("box");
sc.Bg(colBg);
sc.Fg(colFg);
}
else
#endif // GTK 3
{
colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK);
colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT);
}
}
if( !m_hasBgCol )
SetBackgroundColour(colBg);
// create the controls: icon, text and the button to dismiss the
// message.
@@ -115,17 +85,15 @@ bool wxInfoBarGeneric::Create(wxWindow *parent, wxWindowID winid, long style)
wxDefaultPosition, wxDefaultSize,
wxST_ELLIPSIZE_MIDDLE);
if(!m_hasFgCol)
m_text->SetForegroundColour(colFg);
m_button = wxBitmapButton::NewCloseButton(this, wxID_CLOSE);
m_button->SetToolTip(_("Hide this notification message."));
m_checkbox =
new wxCheckBox(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
wxDefaultSize, 0, wxGenericValidator(&m_checked));
m_checkbox->SetForegroundColour(
wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
UpdateColours();
Bind(wxEVT_SYS_COLOUR_CHANGED, &wxInfoBarGeneric::OnSysColourChanged, this);
// center the text inside the sizer with an icon to the left of it and a
// button at the very right
@@ -504,4 +472,51 @@ void wxInfoBarGeneric::ShowCheckBox(const wxString& checkBoxText, bool checked)
}
}
void wxInfoBarGeneric::UpdateColours()
{
// use special, easy to notice, colours
wxColour colBg, colFg;
if ( !m_hasBgCol && !m_hasFgCol )
{
// We want to use the native infobar colours for consistency with the
// native implementation under GTK, but only do it for 3.24, as both
// the CSS structure and the default colour values have changed in this
// version compared to all the previous ones and it seems safer to keep
// the old behaviour for the older GTK versions, see #25048.
#ifdef __WXGTK3__
if ( wx_is_at_least_gtk3(24) )
{
wxGtkStyleContext sc;
sc.Add(GTK_TYPE_INFO_BAR, "infobar", "info", nullptr);
sc.Add("revealer");
sc.Add("box");
sc.Bg(colBg);
sc.Fg(colFg);
}
else
#endif // GTK 3
{
colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOBK);
colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT);
}
}
if ( !m_hasBgCol )
m_backgroundColour = colBg;
if ( !m_hasFgCol )
m_text->SetForegroundColour(colFg);
m_checkbox->SetForegroundColour(
wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
m_button->SetBackgroundColour(GetBackgroundColour());
}
void wxInfoBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
{
UpdateColours();
event.Skip();
}
#endif // wxUSE_INFOBAR