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

Try again to find compromise cross-platform/theme spacing. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7728
This commit is contained in:
Jeff Young 2021-02-27 11:43:19 +00:00
parent 4ede4e061e
commit 1f109ac6aa
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kicad/dialogs/panel_kicad_launcher.cpp
View File

@ -26,14 +26,6 @@
#include "panel_kicad_launcher.h" #include "panel_kicad_launcher.h"
#ifdef __WXMAC__
constexpr int ICON_PADDING = 4;
constexpr int CELL_MARGINS = 0;
#else
constexpr int ICON_PADDING = 5;
constexpr int CELL_MARGINS = 3;
#endif
PANEL_KICAD_LAUNCHER::PANEL_KICAD_LAUNCHER( wxWindow* aParent ) : PANEL_KICAD_LAUNCHER::PANEL_KICAD_LAUNCHER( wxWindow* aParent ) :
PANEL_KICAD_LAUNCHER_BASE( aParent ) PANEL_KICAD_LAUNCHER_BASE( aParent )
{ {
@ -51,7 +43,9 @@ void PANEL_KICAD_LAUNCHER::CreateLaunchers()
} }
wxFont titleFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); wxFont titleFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
#ifndef __WXGTK__
titleFont.SetPointSize( titleFont.GetPointSize() + 2 ); titleFont.SetPointSize( titleFont.GetPointSize() + 2 );
#endif
titleFont.SetWeight( wxFONTWEIGHT_BOLD ); titleFont.SetWeight( wxFONTWEIGHT_BOLD );
wxFont helpFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); wxFont helpFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
@ -62,7 +56,7 @@ void PANEL_KICAD_LAUNCHER::CreateLaunchers()
{ {
BITMAP_BUTTON* btn = new BITMAP_BUTTON( this, wxID_ANY ); BITMAP_BUTTON* btn = new BITMAP_BUTTON( this, wxID_ANY );
btn->SetBitmap( aBitmap ); btn->SetBitmap( aBitmap );
btn->SetPadding( ICON_PADDING ); btn->SetPadding( 5 );
btn->SetToolTip( aAction.GetDescription() ); btn->SetToolTip( aAction.GetDescription() );
auto handler = auto handler =
@ -87,18 +81,16 @@ void PANEL_KICAD_LAUNCHER::CreateLaunchers()
int row = m_toolsSizer->GetRows(); int row = m_toolsSizer->GetRows();
m_toolsSizer->Add( btn, wxGBPosition( row, 0 ), wxGBSpan( 2, 1 ), wxALL, CELL_MARGINS ); m_toolsSizer->Add( btn, wxGBPosition( row, 0 ), wxGBSpan( 2, 1 ), wxBOTTOM, 12 );
#ifdef __WXGTK__
// Due to https://trac.wxwidgets.org/ticket/16088?cversion=0&cnum_hist=7 GTK fails to // Due to https://trac.wxwidgets.org/ticket/16088?cversion=0&cnum_hist=7 GTK fails to
// correctly set the BestSize of non-default-size text so we need to make sure that the // correctly set the BestSize of non-default-size or styled text so we need to make
// BestSize isn't needed. // sure that the BestSize isn't needed by setting wxEXPAND. Unfortunately this makes
// However, another bug on OSX causes this to make the text top-aligned, so we have to // wxALIGN_BOTTOM non-functional, so we have to jump through a bunch more hoops to
// do it only on GTK. Sigh. // try and align the title and help text in the middle of the icon.
m_toolsSizer->Add( label, wxGBPosition( row, 1 ), wxGBSpan( 1, 1 ), wxALIGN_BOTTOM|wxEXPAND, 0 ); m_toolsSizer->Add( label, wxGBPosition( row, 1 ), wxGBSpan( 1, 1 ), wxTOP|wxEXPAND, 10 );
#else
m_toolsSizer->Add( label, wxGBPosition( row, 1 ), wxGBSpan( 1, 1 ), wxALIGN_BOTTOM, 0 ); m_toolsSizer->Add( help, wxGBPosition( row + 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_TOP|wxTOP, 1 );
#endif
m_toolsSizer->Add( help, wxGBPosition( row + 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_TOP, 0 );
}; };
addLauncher( KICAD_MANAGER_ACTIONS::editSchematic, KiScaledBitmap( icon_eeschema_xpm, this ), addLauncher( KICAD_MANAGER_ACTIONS::editSchematic, KiScaledBitmap( icon_eeschema_xpm, this ),

2
kicad/dialogs/panel_kicad_launcher_base.cpp
View File

@ -17,7 +17,7 @@ PANEL_KICAD_LAUNCHER_BASE::PANEL_KICAD_LAUNCHER_BASE( wxWindow* parent, wxWindow
m_mainSizer = new wxBoxSizer( wxVERTICAL ); m_mainSizer = new wxBoxSizer( wxVERTICAL );
m_toolsSizer = new wxGridBagSizer( 0, 10 ); m_toolsSizer = new wxGridBagSizer( 0, 10 );
m_toolsSizer->SetFlexibleDirection( wxHORIZONTAL ); m_toolsSizer->SetFlexibleDirection( wxBOTH );
m_toolsSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE ); m_toolsSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE );

2
kicad/dialogs/panel_kicad_launcher_base.fbp
View File

@ -69,7 +69,7 @@
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxGridBagSizer" expanded="1"> <object class="wxGridBagSizer" expanded="1">
<property name="empty_cell_size"></property> <property name="empty_cell_size"></property>
<property name="flexible_direction">wxHORIZONTAL</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property> <property name="growablecols"></property>
<property name="growablerows"></property> <property name="growablerows"></property>
<property name="hgap">10</property> <property name="hgap">10</property>