comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-05 22:57:51 -04:00
Code Issues Projects Releases Wiki Activity

Force general refresh on font change

Browse Source
This commit is contained in:
vsonnier 2016-06-20 18:29:56 +02:00
parent 46bf72aa0f
commit f3d4b8868a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/AppFrame.cpp
View File

@ -923,12 +923,18 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
//Display : font sizes //Display : font sizes
else if (event.GetId() == wxID_DISPLAY_BASE) { else if (event.GetId() == wxID_DISPLAY_BASE) {
GLFont::setScale(GLFont::GLFONT_SCALE_NORMAL); GLFont::setScale(GLFont::GLFONT_SCALE_NORMAL);
//force all windows refresh
Refresh();
} }
else if (event.GetId() == wxID_DISPLAY_BASE + 1) { else if (event.GetId() == wxID_DISPLAY_BASE + 1) {
GLFont::setScale(GLFont::GLFONT_SCALE_MEDIUM); GLFont::setScale(GLFont::GLFONT_SCALE_MEDIUM);
//force all windows refresh
Refresh();
} }
else if (event.GetId() == wxID_DISPLAY_BASE + 2) { else if (event.GetId() == wxID_DISPLAY_BASE + 2) {
GLFont::setScale(GLFont::GLFONT_SCALE_LARGE); GLFont::setScale(GLFont::GLFONT_SCALE_LARGE);
//force all windows refresh
Refresh();
} }
if (event.GetId() >= wxID_SETTINGS_BASE && event.GetId() < settingsIdMax) { if (event.GetId() >= wxID_SETTINGS_BASE && event.GetId() < settingsIdMax) {

2
src/util/GLFont.cpp
View File

@ -223,8 +223,6 @@ void GLFont::loadFontOnce() {
//full font file path //full font file path
wxFileName fontFileName = wxFileName(resourceFolder + L"/" + fontFile); wxFileName fontFileName = wxFileName(resourceFolder + L"/" + fontFile);
// wxFileName fontFileName = wxFileName(resourceFolder, fontFile);
if (!fontFileName.Exists()) { if (!fontFileName.Exists()) {
wxFileName exePath = wxFileName(wxStandardPaths::Get().GetExecutablePath()); wxFileName exePath = wxFileName(wxStandardPaths::Get().GetExecutablePath());