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

Fix dialog sizing issue on Windows

This commit is contained in:
Chris Pavlina 2016-01-15 20:56:16 -05:00 committed by Chris Pavlina
parent db178dcdaf
commit 2e4bb307dc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/dialogs/dialog_hotkeys_editor.cpp
View File

@ -90,7 +90,7 @@ void HOTKEY_LIST_CTRL::OnSize( wxSizeEvent& aEvent )
#endif #endif
SetColumnWidth( 1, 100 ); SetColumnWidth( 1, 100 );
SetColumnWidth( 0, rect.width - 120 ); SetColumnWidth( 0, rect.width - 130 );
} }

10
eeschema/dialogs/dialog_eeschema_options.cpp
View File

@ -69,7 +69,6 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( SCH_EDIT_FRAME* parent ) :
m_hotkeyListCtrl = new HOTKEY_LIST_CTRL( m_controlsPanel, sections ); m_hotkeyListCtrl = new HOTKEY_LIST_CTRL( m_controlsPanel, sections );
// Insert after the "Hotkeys:" label // Insert after the "Hotkeys:" label
m_controlsSizer->Insert( 1, m_hotkeyListCtrl, wxSizerFlags( 1 ).Expand().Border( wxALL, 5 ) ); m_controlsSizer->Insert( 1, m_hotkeyListCtrl, wxSizerFlags( 1 ).Expand().Border( wxALL, 5 ) );
Layout();
// Bind event for the import/export menu // Bind event for the import/export menu
Bind( wxEVT_MENU, &DIALOG_EESCHEMA_OPTIONS::OnMenu, this ); Bind( wxEVT_MENU, &DIALOG_EESCHEMA_OPTIONS::OnMenu, this );
@ -77,6 +76,14 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( SCH_EDIT_FRAME* parent ) :
// Make sure we select the first tab of the options tab page // Make sure we select the first tab of the options tab page
m_notebook->SetSelection( 0 ); m_notebook->SetSelection( 0 );
// Lay out all child pages
// No, I don't know why this->Layout() doesn't propagate through to these,
// but at least on MSW, it does not.
for( size_t i = 0; i < m_notebook->GetPageCount(); ++i )
{
m_notebook->GetPage( i )->Layout();
}
Layout();
} }
@ -317,6 +324,7 @@ bool DIALOG_EESCHEMA_OPTIONS::TransferDataToWindow()
m_fieldGrid->AutoSizeRows(); m_fieldGrid->AutoSizeRows();
m_fieldGrid->Thaw(); m_fieldGrid->Thaw();
Layout();
return true; return true;
} }