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

This commit is contained in:
enricoturri1966 2020-06-19 11:18:48 +02:00
parent 9608103d58
commit e782d34ec8

View file

@ -233,15 +233,17 @@ private:
{
this->Freeze();
#if !wxVERSION_EQUAL_OR_GREATER_THAN(3,1,3)
// rescale fonts of all controls
scale_controls_fonts(this, m_new_font_point_size);
// rescale current window font
scale_win_font(this, m_new_font_point_size);
#if ENABLE_LAYOUT_NO_RESTART
m_force_rescale = false;
if (m_force_rescale) {
#endif // ENABLE_LAYOUT_NO_RESTART
// rescale fonts of all controls
scale_controls_fonts(this, m_new_font_point_size);
// rescale current window font
scale_win_font(this, m_new_font_point_size);
#if ENABLE_LAYOUT_NO_RESTART
m_force_rescale = false;
}
#endif // ENABLE_LAYOUT_NO_RESTART
#endif // !wxVERSION_EQUAL_OR_GREATER_THAN
// set normal application font as a current window font
m_normal_font = this->GetFont();