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

Fix one more fixed size value in the template selector.

This commit is contained in:
Jeff Young 2021-09-26 22:54:30 +01:00
parent e2368b733c
commit 7bafbf9ca7
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kicad/dialogs/dialog_template_selector.cpp
View File

@ -47,10 +47,10 @@ TEMPLATE_WIDGET::TEMPLATE_WIDGET( wxWindow* aParent, DIALOG_TEMPLATE_SELECTOR* a
// wxWidgets_3.xx way of doing the same... // wxWidgets_3.xx way of doing the same...
// Bind(wxEVT_LEFT_DOWN, &TEMPLATE_WIDGET::OnMouse, this ); // Bind(wxEVT_LEFT_DOWN, &TEMPLATE_WIDGET::OnMouse, this );
m_bitmapIcon->Connect( wxEVT_LEFT_DOWN, m_bitmapIcon->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( TEMPLATE_WIDGET::OnMouse ),
wxMouseEventHandler( TEMPLATE_WIDGET::OnMouse ), nullptr, this ); nullptr, this );
m_staticTitle->Connect( wxEVT_LEFT_DOWN, m_staticTitle->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( TEMPLATE_WIDGET::OnMouse ),
wxMouseEventHandler( TEMPLATE_WIDGET::OnMouse ), nullptr, this ); nullptr, this );
// We're not selected until we're clicked // We're not selected until we're clicked
Unselect(); Unselect();
@ -80,9 +80,9 @@ void TEMPLATE_WIDGET::Unselect()
void TEMPLATE_WIDGET::SetTemplate( PROJECT_TEMPLATE* aTemplate ) void TEMPLATE_WIDGET::SetTemplate( PROJECT_TEMPLATE* aTemplate )
{ {
m_currTemplate = aTemplate; m_currTemplate = aTemplate;
m_staticTitle->SetLabel( *( aTemplate->GetTitle() ) ); m_staticTitle->SetLabel( *aTemplate->GetTitle() );
m_staticTitle->Wrap( 100 ); m_staticTitle->Wrap( 100 );
m_bitmapIcon->SetBitmap( *( aTemplate->GetIcon() ) ); m_bitmapIcon->SetBitmap( *aTemplate->GetIcon() );
} }
@ -98,7 +98,8 @@ void DIALOG_TEMPLATE_SELECTOR::onNotebookResize( wxSizeEvent& event )
{ {
for( size_t i = 0; i < m_notebook->GetPageCount(); i++ ) for( size_t i = 0; i < m_notebook->GetPageCount(); i++ )
{ {
m_panels[i]->SetSize( m_notebook->GetSize().GetWidth() - 6, 140 ); m_panels[i]->SetSize( m_notebook->GetSize().GetWidth() - 6,
m_panels[i]->m_SizerChoice->GetSize().GetHeight() );
m_panels[i]->m_SizerBase->FitInside( m_panels[i] ); m_panels[i]->m_SizerBase->FitInside( m_panels[i] );
m_panels[i]->m_scrolledWindow->SetSize( m_panels[i]->GetSize().GetWidth() - 6, m_panels[i]->m_scrolledWindow->SetSize( m_panels[i]->GetSize().GetWidth() - 6,
m_panels[i]->GetSize().GetHeight() - 6 ); m_panels[i]->GetSize().GetHeight() - 6 );
@ -212,9 +213,7 @@ void DIALOG_TEMPLATE_SELECTOR::buildPageContent( const wxString& aPath, int aPag
wxString sub_full = aPath + sub_name; wxString sub_full = aPath + sub_name;
if( sub_dir.Open( sub_full ) ) if( sub_dir.Open( sub_full ) )
{
AddTemplate( aPage, new PROJECT_TEMPLATE( sub_full ) ); AddTemplate( aPage, new PROJECT_TEMPLATE( sub_full ) );
}
cont = dir.GetNext( &sub_name ); cont = dir.GetNext( &sub_name );
} }
@ -230,8 +229,7 @@ void DIALOG_TEMPLATE_SELECTOR::onDirectoryBrowseClicked( wxCommandEvent& event )
fn.Normalize(); fn.Normalize();
wxString currPath = fn.GetFullPath(); wxString currPath = fn.GetFullPath();
wxDirDialog dirDialog( this, _( "Select Templates Directory" ), wxDirDialog dirDialog( this, _( "Select Templates Directory" ), currPath,
currPath,
wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST ); wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST );
if( dirDialog.ShowModal() != wxID_OK ) if( dirDialog.ShowModal() != wxID_OK )