GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-07 06:19:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move font initialization to init_fonts

Browse Source
This commit is contained in:
YuSanka 2018-06-05 14:38:22 +02:00
parent 5f82d01f19
commit bc6e6492af
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xs/src/slic3r/GUI/GUI.cpp
View File

@ -142,8 +142,8 @@ wxDataViewCtrl *m_objects_ctrl = nullptr;
MyObjectTreeModel *m_objects_model = nullptr; MyObjectTreeModel *m_objects_model = nullptr;
wxCollapsiblePane *m_collpane_settings = nullptr; wxCollapsiblePane *m_collpane_settings = nullptr;
wxFont g_small_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) }; wxFont g_small_font;
wxFont g_bold_font { wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold() }; wxFont g_bold_font;
static void init_label_colours() static void init_label_colours()
{ {
@ -175,6 +175,8 @@ void update_label_colours_from_appconfig()
static void init_fonts() static void init_fonts()
{ {
g_small_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
g_bold_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold();
#ifdef __WXMAC__ #ifdef __WXMAC__
g_small_font.SetPointSize(11); g_small_font.SetPointSize(11);
g_bold_font.SetPointSize(11); g_bold_font.SetPointSize(11);