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

Fix about dialog control spacing. 

There is a difference between how wxStaticText and wxHyperlinkCtrl
controls are rendered causing alignment issue between the two.  The
cheap and dirty solution was to pad the wxStaticText but this may
yield inconsistent results depending on the platform.

Fixes https://gitlab.com/kicad/code/kicad/issues/4843
This commit is contained in:
Wayne Stambaugh 2020-07-08 12:56:05 -04:00
parent 8c15ecf8e4
commit 55dc0e8b2f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/dialog_about/dialog_about.cpp
View File

@ -193,9 +193,9 @@ void DIALOG_ABOUT::createNotebookPage( wxAuiNotebook* aParent, const wxString& a
} }
void DIALOG_ABOUT::createNotebookPageByCategory(wxAuiNotebook* aParent, const wxString& aCaption, void DIALOG_ABOUT::createNotebookPageByCategory( wxAuiNotebook* aParent, const wxString& aCaption,
const wxBitmap& aIcon, const wxBitmap& aIcon,
const CONTRIBUTORS& aContributors) const CONTRIBUTORS& aContributors)
{ {
wxBoxSizer* bSizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* bSizer = new wxBoxSizer( wxHORIZONTAL );
@ -249,7 +249,7 @@ void DIALOG_ABOUT::createNotebookPageByCategory(wxAuiNotebook* aParent, const wx
if ( sub_contributor->GetCategory() == category ) if ( sub_contributor->GetCategory() == category )
{ {
// First column is empty // First column is empty
fgSizer1->AddSpacer(5); fgSizer1->AddSpacer( 5 );
wxControl* ctrl; wxControl* ctrl;
@ -257,7 +257,7 @@ void DIALOG_ABOUT::createNotebookPageByCategory(wxAuiNotebook* aParent, const wx
if( sub_contributor->GetUrl().IsEmpty() ) if( sub_contributor->GetUrl().IsEmpty() )
{ {
ctrl = new wxStaticText( m_scrolledWindow1, wxID_ANY, ctrl = new wxStaticText( m_scrolledWindow1, wxID_ANY,
wxT( " • " ) + sub_contributor->GetName(), wxT( " • " ) + sub_contributor->GetName(),
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize, 0 ); wxDefaultSize, 0 );
} }
@ -268,7 +268,7 @@ void DIALOG_ABOUT::createNotebookPageByCategory(wxAuiNotebook* aParent, const wx
wxT( "• " ) + sub_contributor->GetName(), wxT( "• " ) + sub_contributor->GetName(),
sub_contributor->GetUrl(), sub_contributor->GetUrl(),
wxDefaultPosition, wxDefaultPosition,
wxDefaultSize, wxHL_ALIGN_LEFT ); wxDefaultSize );
} }
m_staticText1->Wrap( -1 ); m_staticText1->Wrap( -1 );
@ -398,7 +398,7 @@ void DIALOG_ABOUT::createNotebookHtmlPage( wxAuiNotebook* aParent, const wxStrin
} }
wxStaticText* DIALOG_ABOUT::wxStaticTextMail(wxScrolledWindow* aParent, const wxString& aEmail) wxStaticText* DIALOG_ABOUT::wxStaticTextMail( wxScrolledWindow* aParent, const wxString& aEmail )
{ {
wxStaticText* text = new wxStaticText( aParent, wxID_ANY, wxStaticText* text = new wxStaticText( aParent, wxID_ANY,
wxT( "<" ) + aEmail + wxT( ">" ) ); wxT( "<" ) + aEmail + wxT( ">" ) );
@ -407,7 +407,7 @@ wxStaticText* DIALOG_ABOUT::wxStaticTextMail(wxScrolledWindow* aParent, const wx
} }
wxStaticBitmap* DIALOG_ABOUT::createStaticBitmap(wxScrolledWindow* aParent, wxBitmap* aIcon) wxStaticBitmap* DIALOG_ABOUT::createStaticBitmap( wxScrolledWindow* aParent, wxBitmap* aIcon )
{ {
wxStaticBitmap* bitmap = new wxStaticBitmap( aParent, wxID_ANY, wxNullBitmap, wxStaticBitmap* bitmap = new wxStaticBitmap( aParent, wxID_ANY, wxNullBitmap,
wxDefaultPosition, wxDefaultSize, 0 ); wxDefaultPosition, wxDefaultSize, 0 );