3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ENABLE_LAYOUT_NO_RESTART -> Fixed font scaling when switching to/from non modal setting dialog layout when building against wxWidgets prior to 3.1.3

Browse source
This commit is contained in:
enricoturri1966 2020-06-19 11:04:08 +02:00
parent 87c9163a5e
commit 9608103d58
3 changed files with 75 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/GUI_App.cpp
View file

@ -122,7 +122,7 @@ static void register_win32_dpi_event()
return true;
});
}
#endif // !ENABLE_WX_3_1_3_DPI_CHANGED_EVENT
#endif // !wxVERSION_EQUAL_OR_GREATER_THAN
static GUID GUID_DEVINTERFACE_HID = { 0x4D1E55B2, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 };
@ -412,7 +412,7 @@ bool GUI_App::on_init_inner()
#ifdef WIN32
#if !wxVERSION_EQUAL_OR_GREATER_THAN(3,1,3)
register_win32_dpi_event();
#endif // !ENABLE_WX_3_1_3_DPI_CHANGED_EVENT
#endif // !wxVERSION_EQUAL_OR_GREATER_THAN
register_win32_device_notification_event();
#endif // WIN32
@ -1079,10 +1079,11 @@ void GUI_App::add_config_menu(wxMenuBar *menu)
#endif // ENABLE_LAYOUT_NO_RESTART
}
#if ENABLE_LAYOUT_NO_RESTART
if (app_layout_changed)
{
if (app_layout_changed) {
mainframe->Hide();
mainframe->update_layout();
mainframe->select_tab(0);
mainframe->Show();
}
#else
if (recreate_app)