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

Fix infobar bitmap size 

Fixes https://gitlab.com/kicad/code/kicad/issues/4514
This commit is contained in:
Ian McInerney 2020-06-02 00:05:55 +01:00 committed by Ian McInerney
parent 7aaf72c473
commit 57e35c9a60
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/widgets/infobar.cpp
View File

@ -20,6 +20,7 @@
#include <id.h> #include <id.h>
#include <widgets/infobar.h> #include <widgets/infobar.h>
#include "wx/artprov.h"
#include <wx/aui/framemanager.h> #include <wx/aui/framemanager.h>
#include <wx/debug.h> #include <wx/debug.h>
#include <wx/infobar.h> #include <wx/infobar.h>
@ -35,21 +36,29 @@ END_EVENT_TABLE()
WX_INFOBAR::WX_INFOBAR( wxWindow* aParent, wxAuiManager *aMgr, wxWindowID aWinid ) WX_INFOBAR::WX_INFOBAR( wxWindow* aParent, wxAuiManager *aMgr, wxWindowID aWinid )
: wxInfoBarGeneric( aParent, aWinid ), : wxInfoBarGeneric( aParent, aWinid ),
m_showTime( 0 ), m_showTime( 0 ),
m_showTimer( nullptr ), m_showTimer( nullptr ),
m_auiManager( aMgr ) m_auiManager( aMgr )
{ {
m_showTimer = new wxTimer( this, ID_CLOSE_INFOBAR ); m_showTimer = new wxTimer( this, ID_CLOSE_INFOBAR );
// Don't use any effects since they leave the sizer area visible under the infobar // Don't use any effects since they leave the sizer area visible under the infobar
SetShowHideEffects( wxSHOW_EFFECT_NONE, wxSHOW_EFFECT_NONE ); SetShowHideEffects( wxSHOW_EFFECT_NONE, wxSHOW_EFFECT_NONE );
// On GTK, the infobar seems to start too small, so increase its height // The infobar seems to start too small, so increase its height
#ifdef __WXGTK__
int sx, sy; int sx, sy;
GetSize( &sx, &sy ); GetSize( &sx, &sy );
SetSize( sx, 1.5 * sy ); sy = 1.5 * sy;
#endif SetSize( sx, sy );
// The bitmap gets cutoff sometimes with the default size, so force it to be the same
// height as the infobar.
wxSizer* sizer = GetSizer();
wxSize iconSize = wxArtProvider::GetSizeHint( wxART_BUTTON );
sizer->SetItemMinSize( (size_t) 0, iconSize.x, sy );
Layout();
} }