haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/common/html_window.cpp

73 lines
2.5 KiB
C++
Raw Normal View History

Use system text and background colors in PCB calculator wxHtmlWindow forces white background and black text. Force it back to system settings.
2021-10-06 23:44:27 +00:00
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2021 Mikołaj Wielgus <wielgusmikolaj@gmail.com>
* Copyright (C) 2021 KiCad Developers, see AUTHORS.TXT for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <html_window.h>
#include <wx/settings.h>
HTML_WINDOW::HTML_WINDOW( wxWindow* aParent, wxWindowID aId, const wxPoint& aPos,
Substitute all wxHtmlWindow with HTML_WINDOW Remove other places where <body> tag is used to override the default black-on-white theme.
2021-10-10 12:52:37 +00:00
const wxSize& aSize, long aStyle, const wxString& aName ) :
wxHtmlWindow( aParent, aId, aPos, aSize, aStyle, aName )
Use system text and background colors in PCB calculator wxHtmlWindow forces white background and black text. Force it back to system settings.
2021-10-06 23:44:27 +00:00
{
Bind( wxEVT_SYS_COLOUR_CHANGED,
wxSysColourChangedEventHandler( HTML_WINDOW::onThemeChanged ), this );
}
bool HTML_WINDOW::SetPage( const wxString& aSource )
{
m_pageSource = aSource;
Formatting.
2021-10-14 19:45:38 +00:00
wxColour fgColor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
wxColour bgColor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
wxColour linkColor = wxSystemSettings::GetColour( wxSYS_COLOUR_HOTLIGHT );
Use system text and background colors in PCB calculator wxHtmlWindow forces white background and black text. Force it back to system settings.
2021-10-06 23:44:27 +00:00
Substitute all wxHtmlWindow with HTML_WINDOW Remove other places where <body> tag is used to override the default black-on-white theme.
2021-10-10 12:52:37 +00:00
wxString html = wxString::Format( wxT( "<html>\n<body text='%s' bgcolor='%s' link='%s'>\n" ),
Formatting.
2021-10-14 19:45:38 +00:00
fgColor.GetAsString( wxC2S_HTML_SYNTAX ),
bgColor.GetAsString( wxC2S_HTML_SYNTAX ),
linkColor.GetAsString( wxC2S_HTML_SYNTAX ) );
Substitute all wxHtmlWindow with HTML_WINDOW Remove other places where <body> tag is used to override the default black-on-white theme.
2021-10-10 12:52:37 +00:00
html.Append( aSource );
html.Append( wxT( "\n</body>\n</html>" ) );
return wxHtmlWindow::SetPage( html );
}
bool HTML_WINDOW::AppendToPage( const wxString& aSource )
{
return SetPage( m_pageSource + aSource );
Use system text and background colors in PCB calculator wxHtmlWindow forces white background and black text. Force it back to system settings.
2021-10-06 23:44:27 +00:00
}
pcb_calculator: Update panel images/text when system theme changes
2021-10-08 16:30:36 +00:00
void HTML_WINDOW::ThemeChanged()
Use system text and background colors in PCB calculator wxHtmlWindow forces white background and black text. Force it back to system settings.
2021-10-06 23:44:27 +00:00
{
SetPage( m_pageSource );
}
pcb_calculator: Update panel images/text when system theme changes
2021-10-08 16:30:36 +00:00
void HTML_WINDOW::onThemeChanged( wxSysColourChangedEvent &aEvent )
{
ThemeChanged();
}