haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try out GTK font scaling based on icon scaling architecture. 

wxWidgets symbolic sizes fail on HiDPI GTK screens; the dialog pixel
stuff fails on non-scaled GTK screens.

Fixes https://gitlab.com/kicad/code/kicad/issues/8608
This commit is contained in:
Jeff Young 2021-09-11 10:56:09 +01:00
parent ad59254be8
commit cc13d6b2e8
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/widgets/ui_common.cpp
View File

@ -33,6 +33,7 @@
#include <dialog_shim.h> #include <dialog_shim.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <bitmaps/bitmap_types.h>
int KIUI::GetStdMargin() int KIUI::GetStdMargin()
{ {
@ -94,21 +95,28 @@ wxFont KIUI::GetMonospacedUIFont()
} }
wxFont makeGUIFont( wxWindow* aWindow, int aDialogSize ) wxFont makeGUIFont( wxWindow* aWindow, int aPtSize )
{ {
wxFont font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); wxFont font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
// Using wxFont::SetSymbolicSize() fails on (at least) GTK with HiDPI screens, but the // Using wxFont::SetSymbolicSize() fails on (at least) GTK with HiDPI screens (too small),
// dialog pixel conversion stuff seems to work.... // and the dialog pixel conversion stuff fails on (at least) GTK _without_ HiDPI screens
// (too large).
int vert_size = aWindow->ConvertDialogToPixels( wxSize( 0, aDialogSize ) ).y; int requested_scale = Pgm().GetCommonSettings()->m_Appearance.icon_scale;
font.SetPointSize( vert_size / 2 ); if( requested_scale <= 0 )
requested_scale = KiIconScale( aWindow );
font.SetPointSize( KiROUND( aPtSize * requested_scale / 4.0 ) );
#ifdef __WXMAC__ #ifdef __WXMAC__
// https://trac.wxwidgets.org/ticket/19210 // https://trac.wxwidgets.org/ticket/19210
if( font.GetFaceName().IsEmpty() ) if( font.GetFaceName().IsEmpty() )
font.SetFaceName( "Lucida Grande" ); font.SetFaceName( "San Francisco" );
// OSX 10.1 .. 10.9: Lucida Grande
// OSX 10.10: Helvetica Neue
// OSX 10.11 .. : San Francisco
#endif #endif
return font; return font;
@ -117,13 +125,13 @@ wxFont makeGUIFont( wxWindow* aWindow, int aDialogSize )
wxFont KIUI::GetControlFont( wxWindow* aWindow ) wxFont KIUI::GetControlFont( wxWindow* aWindow )
{ {
return makeGUIFont( aWindow, 14 ); return makeGUIFont( aWindow, 13 );
} }
wxFont KIUI::GetInfoFont( wxWindow* aWindow ) wxFont KIUI::GetInfoFont( wxWindow* aWindow )
{ {
return makeGUIFont( aWindow, 13 ); return makeGUIFont( aWindow, 12 );
} }