diff --git a/common/dialogs/panel_setup_netclasses.cpp b/common/dialogs/panel_setup_netclasses.cpp index 26b7decda0..750db8e911 100644 --- a/common/dialogs/panel_setup_netclasses.cpp +++ b/common/dialogs/panel_setup_netclasses.cpp @@ -136,7 +136,7 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, NETCLASSE attr->SetEditor( new GRID_CELL_ICON_TEXT_POPUP( g_lineStyleIcons, g_lineStyleNames ) ); m_netclassGrid->SetColAttr( GRID_LINESTYLE, attr ); - m_colorDefaultHelpText->SetFont( KIUI::GetInfoFont() ); + m_colorDefaultHelpText->SetFont( KIUI::GetInfoFont( this ) ); } else { diff --git a/common/eda_draw_frame.cpp b/common/eda_draw_frame.cpp index db5e12c6e9..ad24b6669c 100644 --- a/common/eda_draw_frame.cpp +++ b/common/eda_draw_frame.cpp @@ -145,7 +145,7 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame }; SetStatusWidths( arrayDim( dims ), dims ); - stsbar->SetFont( KIUI::GetStatusFont() ); + stsbar->SetFont( KIUI::GetStatusFont( this ) ); // Create child subwindows. GetClientSize( &m_frameSize.x, &m_frameSize.y ); diff --git a/common/tool/action_menu.cpp b/common/tool/action_menu.cpp index 8801c9e0c3..b788f30887 100644 --- a/common/tool/action_menu.cpp +++ b/common/tool/action_menu.cpp @@ -338,7 +338,7 @@ void ACTION_MENU::updateHotKeys() const TOOL_ACTION& action = *ii.second; int key = toolMgr->GetHotKey( action ) & ~MD_MODIFIER_MASK; - if( key ) + if( key >= 0 ) { int mod = toolMgr->GetHotKey( action ) & MD_MODIFIER_MASK; int flags = 0; diff --git a/common/widgets/msgpanel.cpp b/common/widgets/msgpanel.cpp index e3f5fbe9f5..dcc342cae1 100644 --- a/common/widgets/msgpanel.cpp +++ b/common/widgets/msgpanel.cpp @@ -48,7 +48,7 @@ EDA_MSG_PANEL::EDA_MSG_PANEL( wxWindow* aParent, int aId, long style, const wxString &name ) : wxPanel( aParent, aId, aPosition, aSize, style, name ) { - SetFont( KIUI::GetStatusFont() ); + SetFont( KIUI::GetStatusFont( this ) ); SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); // informs wx not to paint the background itself as we will paint it later in erase() @@ -65,16 +65,24 @@ EDA_MSG_PANEL::~EDA_MSG_PANEL() } -int EDA_MSG_PANEL::GetRequiredHeight() +wxSize computeFontSize() { + // Get size of the wxSYS_DEFAULT_GUI_FONT wxSize fontSizeInPixels; + wxScreenDC dc; - dc.SetFont( KIUI::GetStatusFont() ); + dc.SetFont( wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ) ); dc.GetTextExtent( wxT( "W" ), &fontSizeInPixels.x, &fontSizeInPixels.y ); + return fontSizeInPixels; +} + + +int EDA_MSG_PANEL::GetRequiredHeight() +{ // make space for two rows of text plus a number of pixels between them. - return 2 * fontSizeInPixels.y + 0; + return 2 * computeFontSize().y + 0; } @@ -87,7 +95,7 @@ void EDA_MSG_PANEL::OnPaint( wxPaintEvent& aEvent ) dc.SetBackground( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); dc.SetBackgroundMode( wxSOLID ); dc.SetTextBackground( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); - dc.SetFont( KIUI::GetStatusFont() ); + dc.SetFont( KIUI::GetStatusFont( this ) ); for( const MSG_PANEL_ITEM& item : m_Items ) showItem( dc, item ); diff --git a/common/widgets/ui_common.cpp b/common/widgets/ui_common.cpp index d6fb66c33e..b911ea5ce5 100644 --- a/common/widgets/ui_common.cpp +++ b/common/widgets/ui_common.cpp @@ -94,10 +94,25 @@ wxFont KIUI::GetMonospacedUIFont() } -wxFont KIUI::GetInfoFont() +wxFont makeGUIFont( wxWindow* aWindow, int aDialogSize ) { wxFont font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - font.SetSymbolicSize( wxFONTSIZE_SMALL ); + + // Using wxFont::SetSymbolicSize() fails on (at least) GTK with HiDPI screens, so we have + // to build our own version based off our icon scaling architecture. + + int vert_size = aWindow->ConvertDialogToPixels( wxSize( 0, aDialogSize ) ).y; + + if( Pgm().GetCommonSettings()->m_Appearance.icon_scale > 0 ) + vert_size *= Pgm().GetCommonSettings()->m_Appearance.icon_scale / 4; + + if( vert_size < 7 ) + vert_size = 7; + + if( vert_size < 10 ) + vert_size += 1; + + font.SetPointSize( vert_size ); #ifdef __WXMAC__ // https://trac.wxwidgets.org/ticket/19210 @@ -109,16 +124,21 @@ wxFont KIUI::GetInfoFont() } -wxFont KIUI::GetStatusFont() +wxFont KIUI::GetControlFont( wxWindow* aWindow ) { - // wxFONTSIZE_X_SMALL is too small, so we take the wxFONTSIZE_SMALL infofont and adjust - // it by wxFONTSIZE_SMALL again. + return makeGUIFont( aWindow, 7 ); +} - wxFont font = GetInfoFont(); - font.SetPointSize( wxFont::AdjustToSymbolicSize( wxFONTSIZE_SMALL, font.GetPointSize() ) ); +wxFont KIUI::GetInfoFont( wxWindow* aWindow ) +{ + return makeGUIFont( aWindow, 6 ); +} - return font; + +wxFont KIUI::GetStatusFont( wxWindow* aWindow ) +{ + return makeGUIFont( aWindow, 5 ); } diff --git a/common/widgets/wx_grid.cpp b/common/widgets/wx_grid.cpp index baaf0bbd73..d7decce4a9 100644 --- a/common/widgets/wx_grid.cpp +++ b/common/widgets/wx_grid.cpp @@ -25,7 +25,7 @@ #include #include #include - +#include #include @@ -40,9 +40,8 @@ WX_GRID::WX_GRID( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxS SetDefaultCellOverflow( false ); // Make sure the GUI font scales properly on GTK - wxFont guiFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - guiFont.SetSymbolicSize( wxFONTSIZE_MEDIUM ); - SetDefaultCellFont( guiFont ); + SetDefaultCellFont( KIUI::GetControlFont( this ) ); + } diff --git a/cvpcb/cvpcb_mainframe.cpp b/cvpcb/cvpcb_mainframe.cpp index 4aefa92d34..83e43e1299 100644 --- a/cvpcb/cvpcb_mainframe.cpp +++ b/cvpcb/cvpcb_mainframe.cpp @@ -132,9 +132,9 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) : wxStaticLine* staticline1 = new wxStaticLine( bottomPanel ); panelSizer->Add( staticline1, 0, wxEXPAND, 5 ); - m_statusLine1->SetFont( KIUI::GetInfoFont() ); - m_statusLine2->SetFont( KIUI::GetInfoFont() ); - m_statusLine3->SetFont( KIUI::GetInfoFont() ); + m_statusLine1->SetFont( KIUI::GetInfoFont( this ) ); + m_statusLine2->SetFont( KIUI::GetInfoFont( this ) ); + m_statusLine3->SetFont( KIUI::GetInfoFont( this ) ); // Add buttons: auto buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); diff --git a/eeschema/dialogs/dialog_junction_props.cpp b/eeschema/dialogs/dialog_junction_props.cpp index 770b72991f..562c514ca6 100644 --- a/eeschema/dialogs/dialog_junction_props.cpp +++ b/eeschema/dialogs/dialog_junction_props.cpp @@ -37,8 +37,8 @@ DIALOG_JUNCTION_PROPS::DIALOG_JUNCTION_PROPS( SCH_EDIT_FRAME* aParent, m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); - m_helpLabel1->SetFont( KIUI::GetInfoFont() ); - m_helpLabel2->SetFont( KIUI::GetInfoFont() ); + m_helpLabel1->SetFont( KIUI::GetInfoFont( this ) ); + m_helpLabel2->SetFont( KIUI::GetInfoFont( this ) ); SetInitialFocus( m_textCtrlDiameter ); diff --git a/eeschema/dialogs/dialog_lib_text_properties.cpp b/eeschema/dialogs/dialog_lib_text_properties.cpp index e97ac61322..1f01551bf2 100644 --- a/eeschema/dialogs/dialog_lib_text_properties.cpp +++ b/eeschema/dialogs/dialog_lib_text_properties.cpp @@ -45,7 +45,7 @@ DIALOG_LIB_TEXT_PROPERTIES::DIALOG_LIB_TEXT_PROPERTIES( SYMBOL_EDIT_FRAME* aPare m_TextValueSelectButton->Hide(); m_PowerComponentValues->Show( false ); - m_PowerComponentValues->SetFont( KIUI::GetInfoFont() ); + m_PowerComponentValues->SetFont( KIUI::GetInfoFont( this ) ); SetInitialFocus( m_TextCtrl ); m_StyledTextCtrl->Show( false ); diff --git a/eeschema/dialogs/dialog_line_wire_bus_properties.cpp b/eeschema/dialogs/dialog_line_wire_bus_properties.cpp index 45d6c1ed05..e3cb76e709 100644 --- a/eeschema/dialogs/dialog_line_wire_bus_properties.cpp +++ b/eeschema/dialogs/dialog_line_wire_bus_properties.cpp @@ -64,8 +64,8 @@ DIALOG_LINE_WIRE_BUS_PROPERTIES::DIALOG_LINE_WIRE_BUS_PROPERTIES( SCH_EDIT_FRAME m_colorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED ); - m_helpLabel1->SetFont( KIUI::GetInfoFont() ); - m_helpLabel2->SetFont( KIUI::GetInfoFont() ); + m_helpLabel1->SetFont( KIUI::GetInfoFont( this ) ); + m_helpLabel2->SetFont( KIUI::GetInfoFont( this ) ); SetInitialFocus( m_lineWidth ); diff --git a/eeschema/dialogs/dialog_sheet_properties.cpp b/eeschema/dialogs/dialog_sheet_properties.cpp index a6cd0367cf..f07376731b 100644 --- a/eeschema/dialogs/dialog_sheet_properties.cpp +++ b/eeschema/dialogs/dialog_sheet_properties.cpp @@ -81,7 +81,7 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S m_bpMoveDown->SetBitmap( KiBitmap( BITMAPS::small_down ) ); // Set font sizes - m_hierarchicalPathLabel->SetFont( KIUI::GetInfoFont() ); + m_hierarchicalPathLabel->SetFont( KIUI::GetInfoFont( this ) ); // wxFormBuilder doesn't include this event... m_grid->Connect( wxEVT_GRID_CELL_CHANGING, diff --git a/eeschema/dialogs/dialog_text_and_label_properties.cpp b/eeschema/dialogs/dialog_text_and_label_properties.cpp index aeb9b7a894..3bf70765a6 100644 --- a/eeschema/dialogs/dialog_text_and_label_properties.cpp +++ b/eeschema/dialogs/dialog_text_and_label_properties.cpp @@ -116,8 +116,8 @@ DIALOG_TEXT_AND_LABEL_PROPERTIES::DIALOG_TEXT_AND_LABEL_PROPERTIES( SCH_EDIT_FRA if( m_CurrentText->Type() == SCH_GLOBAL_LABEL_T ) { - m_note1->SetFont( KIUI::GetStatusFont() ); - m_note2->SetFont( KIUI::GetStatusFont() ); + m_note1->SetFont( KIUI::GetInfoFont( this ) ); + m_note2->SetFont( KIUI::GetInfoFont( this ) ); } else { diff --git a/eeschema/dialogs/panel_eeschema_display_options.cpp b/eeschema/dialogs/panel_eeschema_display_options.cpp index b78cdfe8d7..d36effa451 100644 --- a/eeschema/dialogs/panel_eeschema_display_options.cpp +++ b/eeschema/dialogs/panel_eeschema_display_options.cpp @@ -37,7 +37,7 @@ PANEL_EESCHEMA_DISPLAY_OPTIONS::PANEL_EESCHEMA_DISPLAY_OPTIONS( SCH_EDIT_FRAME* m_galOptionsSizer->Add( m_galOptsPanel, 1, wxEXPAND, 0 ); - m_highlightColorNote->SetFont( KIUI::GetInfoFont() ); + m_highlightColorNote->SetFont( KIUI::GetInfoFont( this ) ); } diff --git a/include/widgets/ui_common.h b/include/widgets/ui_common.h index 03cbd9cce8..b54ed4cf8d 100644 --- a/include/widgets/ui_common.h +++ b/include/widgets/ui_common.h @@ -52,9 +52,9 @@ wxSize GetTextSize( const wxString& aSingleLine, wxWindow* aWindow ); wxFont GetMonospacedUIFont(); -wxFont GetInfoFont(); - -wxFont GetStatusFont(); +wxFont GetControlFont( wxWindow* aWindow ); +wxFont GetInfoFont( wxWindow* aWindow ); +wxFont GetStatusFont( wxWindow* aWindow ); /** * Set the minimum pixel width on a text control in order to make a text diff --git a/kicad/project_tree.cpp b/kicad/project_tree.cpp index 93be94852f..4348e7c866 100644 --- a/kicad/project_tree.cpp +++ b/kicad/project_tree.cpp @@ -49,9 +49,7 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) : m_projectTreePane = parent; // Make sure the GUI font scales properly on GTK - wxFont guiFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - guiFont.SetSymbolicSize( wxFONTSIZE_MEDIUM ); - SetFont( guiFont ); + SetFont( KIUI::GetControlFont( this ) ); // icons size is not know (depending on they are built) // so get it: diff --git a/pagelayout_editor/dialogs/properties_frame.cpp b/pagelayout_editor/dialogs/properties_frame.cpp index 65bc610894..e016cc5ffe 100644 --- a/pagelayout_editor/dialogs/properties_frame.cpp +++ b/pagelayout_editor/dialogs/properties_frame.cpp @@ -78,7 +78,7 @@ PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ) : m_stcText->SetUseHorizontalScrollBar( false ); m_scintillaTricks = new SCINTILLA_TRICKS( m_stcText, wxT( "{}" ), false ); - m_staticTextSizeInfo->SetFont( KIUI::GetStatusFont() ); + m_staticTextSizeInfo->SetFont( KIUI::GetStatusFont( this ) ); m_buttonOK->SetDefault(); diff --git a/pcb_calculator/pcb_calculator_frame.cpp b/pcb_calculator/pcb_calculator_frame.cpp index b58081a21d..e0ba77b6f9 100644 --- a/pcb_calculator/pcb_calculator_frame.cpp +++ b/pcb_calculator/pcb_calculator_frame.cpp @@ -74,7 +74,7 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_attenuator_list.push_back( new ATTENUATOR_SPLITTER() ); m_currAttenuator = m_attenuator_list[0]; - m_staticTextAttMsg->SetFont( KIUI::GetInfoFont() ); + m_staticTextAttMsg->SetFont( KIUI::GetInfoFont( this ) ); m_IadjUnitLabel->SetLabel( wxT( "µA" ) ); diff --git a/pcbnew/dialogs/dialog_board_statistics.cpp b/pcbnew/dialogs/dialog_board_statistics.cpp index e19e5776fb..cc7e03ce42 100644 --- a/pcbnew/dialogs/dialog_board_statistics.cpp +++ b/pcbnew/dialogs/dialog_board_statistics.cpp @@ -91,7 +91,7 @@ DIALOG_BOARD_STATISTICS::DIALOG_BOARD_STATISTICS( PCB_EDIT_FRAME* aParentFrame ) m_checkBoxSubtractHoles->SetValue( s_savedDialogState.subtractHoles ); // Make labels for grids - wxFont headingFont = KIUI::GetInfoFont(); + wxFont headingFont = KIUI::GetInfoFont( this ); m_gridComponents->SetCellValue( ROW_LABEL, COL_FRONT_SIDE, _( "Front Side" ) ); m_gridComponents->SetCellFont( ROW_LABEL, COL_FRONT_SIDE, headingFont ); m_gridComponents->SetCellValue( ROW_LABEL, COL_BOTTOM_SIDE, _( "Back Side" ) ); diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp index 4abb49b852..271d8f7f2f 100644 --- a/pcbnew/dialogs/dialog_footprint_properties.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties.cpp @@ -109,7 +109,7 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen m_orientValidator.SetWindow( m_OrientValueCtrl ); // Set font size for items showing long strings: - wxFont infoFont = KIUI::GetInfoFont(); + wxFont infoFont = KIUI::GetInfoFont( this ); #if __WXMAC__ m_allow90Label->SetFont( infoFont ); m_allow180Label->SetFont( infoFont ); diff --git a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp index 8f058eaf46..49d374b18b 100644 --- a/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties_fp_editor.cpp @@ -101,7 +101,7 @@ DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR::DIALOG_FOOTPRINT_PROPERTIES_FP_EDITOR( m_FootprintNameCtrl->SetValidator( FOOTPRINT_NAME_VALIDATOR() ); // Set font sizes - wxFont infoFont = KIUI::GetInfoFont(); + wxFont infoFont = KIUI::GetInfoFont( this ); #if __WXMAC__ m_allow90Label->SetFont( infoFont ); m_allow180Label->SetFont( infoFont ); diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name.h b/pcbnew/dialogs/dialog_get_footprint_by_name.h index 9714eba735..e177cc7661 100644 --- a/pcbnew/dialogs/dialog_get_footprint_by_name.h +++ b/pcbnew/dialogs/dialog_get_footprint_by_name.h @@ -46,7 +46,7 @@ public: m_sdbSizerOK->SetDefault(); m_choiceFpList->Append( aFpList ); - m_multipleHint->SetFont( KIUI::GetStatusFont() ); + m_multipleHint->SetFont( KIUI::GetStatusFont( this ) ); // Hide help string until someone implements successive placement (#2227) m_multipleHint->Show( false ); diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp index 09f7a9fd90..93169a33c0 100644 --- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp +++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp @@ -139,7 +139,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_ m_LayerCtrl->Resync(); m_grid->SetCellHighlightPenWidth( 0 ); - m_grid->SetDefaultCellFont( KIUI::GetInfoFont() ); + m_grid->SetDefaultCellFont( KIUI::GetInfoFont( this ) ); m_sdbSizerButtonsOK->SetDefault(); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp index effd8e9e9e..bdd4204ba8 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp @@ -129,7 +129,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( PCB_EDIT m_layerBox->SetUndefinedLayerName( INDETERMINATE_ACTION ); m_layerBox->Resync(); - m_netclassGrid->SetDefaultCellFont( KIUI::GetInfoFont() ); + m_netclassGrid->SetDefaultCellFont( KIUI::GetInfoFont( this ) ); buildNetclassesGrid(); m_netclassGrid->SetCellHighlightPenWidth( 0 ); diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp index fdd1f3021c..a2ceacad73 100644 --- a/pcbnew/dialogs/dialog_pad_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_properties.cpp @@ -205,7 +205,7 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, PAD* aPad initValues(); - wxFont infoFont = KIUI::GetInfoFont(); + wxFont infoFont = KIUI::GetInfoFont( this ); m_copperLayersLabel->SetFont( infoFont ); m_techLayersLabel->SetFont( infoFont ); m_parentInfo->SetFont( infoFont ); diff --git a/pcbnew/dialogs/dialog_text_properties.cpp b/pcbnew/dialogs/dialog_text_properties.cpp index e4153d1559..bff335ecca 100644 --- a/pcbnew/dialogs/dialog_text_properties.cpp +++ b/pcbnew/dialogs/dialog_text_properties.cpp @@ -131,7 +131,7 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, BO m_OrientCtrl->SetString( ii, wxString::Format( "%.1f", rot_list[ii] ) ); // Set font sizes - m_statusLine->SetFont( KIUI::GetStatusFont() ); + m_statusLine->SetFont( KIUI::GetStatusFont( this ) ); m_sdbSizerOK->SetDefault(); diff --git a/pcbnew/dialogs/panel_fp_editor_defaults.cpp b/pcbnew/dialogs/panel_fp_editor_defaults.cpp index fd89685af4..f2215cdce4 100644 --- a/pcbnew/dialogs/panel_fp_editor_defaults.cpp +++ b/pcbnew/dialogs/panel_fp_editor_defaults.cpp @@ -199,7 +199,7 @@ PANEL_FP_EDITOR_DEFAULTS::PANEL_FP_EDITOR_DEFAULTS( FOOTPRINT_EDIT_FRAME* aFrame m_graphicsGrid->PushEventHandler( new GRID_TRICKS( m_graphicsGrid ) ); - m_staticTextInfo->SetFont( KIUI::GetInfoFont() ); + m_staticTextInfo->SetFont( KIUI::GetInfoFont( this ) ); } diff --git a/pcbnew/dialogs/panel_setup_constraints.cpp b/pcbnew/dialogs/panel_setup_constraints.cpp index dc0e4575ae..4a12988ffb 100644 --- a/pcbnew/dialogs/panel_setup_constraints.cpp +++ b/pcbnew/dialogs/panel_setup_constraints.cpp @@ -51,7 +51,7 @@ PANEL_SETUP_CONSTRAINTS::PANEL_SETUP_CONSTRAINTS( PAGED_DIALOG* aParent, PCB_EDI m_Frame = aFrame; m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings(); - m_stCircleToPolyWarning->SetFont( KIUI::GetInfoFont() ); + m_stCircleToPolyWarning->SetFont( KIUI::GetInfoFont( this ) ); }