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

Eeschema, choose component dialog: remember the relative size of the component tree and the symbol viewer canvas during a session

This commit is contained in:
jean-pierre charras 2018-02-08 19:40:55 +01:00
parent b04b1dcfb5
commit 07fff6ed35
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
eeschema/dialogs/dialog_choose_component.cpp
View File

@ -48,7 +48,8 @@
FOOTPRINT_ASYNC_LOADER DIALOG_CHOOSE_COMPONENT::m_fp_loader; FOOTPRINT_ASYNC_LOADER DIALOG_CHOOSE_COMPONENT::m_fp_loader;
std::unique_ptr<FOOTPRINT_LIST> DIALOG_CHOOSE_COMPONENT::m_fp_list; std::unique_ptr<FOOTPRINT_LIST> DIALOG_CHOOSE_COMPONENT::m_fp_list;
wxSize DIALOG_CHOOSE_COMPONENT::m_default_size( -1, -1 ); wxSize DIALOG_CHOOSE_COMPONENT::m_last_dlg_size( -1, -1 );
int DIALOG_CHOOSE_COMPONENT::m_tree_canvas_sash_position = 0;
DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const wxString& aTitle, DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const wxString& aTitle,
CMP_TREE_MODEL_ADAPTER::PTR& aAdapter, int aDeMorganConvert, bool aAllowFieldEdits, CMP_TREE_MODEL_ADAPTER::PTR& aAdapter, int aDeMorganConvert, bool aAllowFieldEdits,
@ -72,7 +73,7 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
auto vsplitter = aShowFootprints ? nullptr : new wxSplitterWindow( auto vsplitter = aShowFootprints ? nullptr : new wxSplitterWindow(
this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE | wxSP_3DSASH ); this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE | wxSP_3DSASH );
auto splitter = new wxSplitterWindow( m_splitter_tree_canvas = new wxSplitterWindow(
vsplitter ? static_cast<wxWindow *>( vsplitter ) : static_cast<wxWindow *>( this ), vsplitter ? static_cast<wxWindow *>( vsplitter ) : static_cast<wxWindow *>( this ),
wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE | wxSP_3DSASH ); wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE | wxSP_3DSASH );
@ -80,16 +81,16 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
vsplitter, wxID_ANY, wxDefaultPosition, wxDefaultSize, vsplitter, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER ); wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER );
m_tree = new COMPONENT_TREE( splitter, Prj().SchSymbolLibTable(), aAdapter, m_tree = new COMPONENT_TREE( m_splitter_tree_canvas, Prj().SchSymbolLibTable(),
COMPONENT_TREE::WIDGETS::ALL, details ); aAdapter, COMPONENT_TREE::WIDGETS::ALL, details );
auto right_panel = ConstructRightPanel( splitter ); m_symbol_view_panel = ConstructRightPanel( m_splitter_tree_canvas );
auto buttons = new wxStdDialogButtonSizer(); auto buttons = new wxStdDialogButtonSizer();
m_dbl_click_timer = new wxTimer( this ); m_dbl_click_timer = new wxTimer( this );
if( vsplitter ) if( vsplitter )
sizer->Add( vsplitter, 1, wxEXPAND | wxALL, 5 ); sizer->Add( vsplitter, 1, wxEXPAND | wxALL, 5 );
else else
sizer->Add( splitter, 1, wxEXPAND | wxALL, 5 ); sizer->Add( m_splitter_tree_canvas, 1, wxEXPAND | wxALL, 5 );
buttons->AddButton( new wxButton( this, wxID_OK ) ); buttons->AddButton( new wxButton( this, wxID_OK ) );
buttons->AddButton( new wxButton( this, wxID_CANCEL ) ); buttons->AddButton( new wxButton( this, wxID_CANCEL ) );
@ -112,20 +113,24 @@ DIALOG_CHOOSE_COMPONENT::DIALOG_CHOOSE_COMPONENT( SCH_BASE_FRAME* aParent, const
Layout(); Layout();
if( m_default_size == wxSize( -1, -1 ) ) if( m_last_dlg_size == wxSize( -1, -1 ) )
SetSizeInDU( 320, 256 ); SetSizeInDU( 320, 256 );
else else
SetSize( m_default_size ); SetSize( m_last_dlg_size );
splitter->SetSashGravity( 0.9 ); m_splitter_tree_canvas->SetSashGravity( 0.8 );
splitter->SetMinimumPaneSize( 1 ); m_splitter_tree_canvas->SetMinimumPaneSize( 20 );
splitter->SplitVertically( m_tree, right_panel, HorizPixelsFromDU( -100 ) ); // We specify the width of the right window (m_symbol_view_panel), because specify
// the width of the left window does not work as expected when SetSashGravity() is called
m_splitter_tree_canvas->SplitVertically( m_tree, m_symbol_view_panel,
m_tree_canvas_sash_position ? -m_tree_canvas_sash_position
: HorizPixelsFromDU( -100 ) );
if( vsplitter ) if( vsplitter )
{ {
vsplitter->SetSashGravity( 0.5 ); vsplitter->SetSashGravity( 0.5 );
vsplitter->SetMinimumPaneSize( 1 ); vsplitter->SetMinimumPaneSize( 20 );
vsplitter->SplitHorizontally( splitter, details, VertPixelsFromDU( -80 ) ); vsplitter->SplitHorizontally( m_splitter_tree_canvas, details, VertPixelsFromDU( -80 ) );
} }
} }
@ -139,7 +144,9 @@ DIALOG_CHOOSE_COMPONENT::~DIALOG_CHOOSE_COMPONENT()
delete m_dbl_click_timer; delete m_dbl_click_timer;
m_default_size = GetSize(); m_last_dlg_size = GetSize();
m_tree_canvas_sash_position = m_splitter_tree_canvas->GetClientSize().x
- m_splitter_tree_canvas->GetSashPosition();
} }

10
eeschema/dialogs/dialog_choose_component.h
View File

@ -189,6 +189,13 @@ protected:
wxTimer* m_dbl_click_timer; wxTimer* m_dbl_click_timer;
wxPanel* m_sch_view_ctrl; wxPanel* m_sch_view_ctrl;
// the wxSplitterWindow that manages the symbol tree and symbol canvas viewer
wxSplitterWindow* m_splitter_tree_canvas;
// the symbol canvas viewer
wxPanel* m_symbol_view_panel;
// the sash position separation between symbol tree and symbol canvas viewer
// (remember the sash position during a session)
static int m_tree_canvas_sash_position;
FOOTPRINT_SELECT_WIDGET* m_fp_sel_ctrl; FOOTPRINT_SELECT_WIDGET* m_fp_sel_ctrl;
FOOTPRINT_PREVIEW_WIDGET* m_fp_view_ctrl; FOOTPRINT_PREVIEW_WIDGET* m_fp_view_ctrl;
@ -205,7 +212,8 @@ protected:
static std::unique_ptr<FOOTPRINT_LIST> m_fp_list; static std::unique_ptr<FOOTPRINT_LIST> m_fp_list;
std::vector<std::pair<int, wxString>> m_field_edits; std::vector<std::pair<int, wxString>> m_field_edits;
static wxSize m_default_size; // Remember the dialog size during a session
static wxSize m_last_dlg_size;
}; };
#endif /* DIALOG_CHOOSE_COMPONENT_H */ #endif /* DIALOG_CHOOSE_COMPONENT_H */