AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-04 23:35:31 +00:00
Files Issues Releases Activity

PANEL_TOOLBAR_CUSTOMIZATION: fix sizer issues.

Browse Source
This commit is contained in:
jean-pierre charras 2025-03-02 12:53:59 +01:00
parent 0acdabd1eb
commit 2890500f4c
4 changed files with 14 additions and 11 deletions

4
common/dialogs/panel_toolbar_customization.cpp
View File

@ -45,8 +45,8 @@ enum
static std::map<TOOLBAR_LOC, wxString> s_toolbarNameMap = {
{ TOOLBAR_LOC::LEFT, _( "Left" ) },
{ TOOLBAR_LOC::RIGHT, _( "Right" ) },
{ TOOLBAR_LOC::TOP_AUX, _( "Top main" ) },
{ TOOLBAR_LOC::TOP_MAIN, _( "Top auxillary" ) }
{ TOOLBAR_LOC::TOP_MAIN, _( "Top main" ) },
{ TOOLBAR_LOC::TOP_AUX, _( "Top auxillary" ) }
};

8
common/dialogs/panel_toolbar_customization.fbp
View File

@ -48,7 +48,7 @@
<property name="minimum_size"></property>
<property name="name">PANEL_TOOLBAR_CUSTOMIZATION_BASE</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="size">561,333</property>
<property name="subclass">RESETTABLE_PANEL; widgets/resettable_panel.h; forward_declare</property>
<property name="tooltip"></property>
<property name="two_step_creation">0</property>
@ -193,8 +193,8 @@
<object class="wxFlexGridSizer" expanded="true">
<property name="cols">3</property>
<property name="flexible_direction">wxHORIZONTAL</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="growablecols">0,2</property>
<property name="growablerows">0,2</property>
<property name="hgap">0</property>
<property name="minimum_size"></property>
<property name="name">m_customizeControls</property>
@ -298,7 +298,7 @@
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxTreeCtrl" expanded="false">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>

9
common/dialogs/panel_toolbar_customization_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6-dirty)
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -24,6 +24,10 @@ PANEL_TOOLBAR_CUSTOMIZATION_BASE::PANEL_TOOLBAR_CUSTOMIZATION_BASE( wxWindow* pa
wxFlexGridSizer* m_customizeControls;
m_customizeControls = new wxFlexGridSizer( 1, 3, 0, 0 );
m_customizeControls->AddGrowableCol( 0 );
m_customizeControls->AddGrowableCol( 2 );
m_customizeControls->AddGrowableRow( 0 );
m_customizeControls->AddGrowableRow( 2 );
m_customizeControls->SetFlexibleDirection( wxHORIZONTAL );
m_customizeControls->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -42,7 +46,7 @@ PANEL_TOOLBAR_CUSTOMIZATION_BASE::PANEL_TOOLBAR_CUSTOMIZATION_BASE( wxWindow* pa
bSizer11 = new wxBoxSizer( wxVERTICAL );
m_toolbarTree = new wxTreeCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE|wxTR_EDIT_LABELS|wxTR_HIDE_ROOT|wxTR_NO_LINES );
bSizer11->Add( m_toolbarTree, 0, wxALL|wxEXPAND, 5 );
bSizer11->Add( m_toolbarTree, 1, wxALL|wxEXPAND, 5 );
bSizer10->Add( bSizer11, 1, wxEXPAND, 5 );
@ -104,7 +108,6 @@ PANEL_TOOLBAR_CUSTOMIZATION_BASE::PANEL_TOOLBAR_CUSTOMIZATION_BASE( wxWindow* pa
this->SetSizer( bPanelSizer );
this->Layout();
bPanelSizer->Fit( this );
// Connect Events
this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( PANEL_TOOLBAR_CUSTOMIZATION_BASE::OnUpdateUI ) );

4
common/dialogs/panel_toolbar_customization_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6-dirty)
// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -67,7 +67,7 @@ class PANEL_TOOLBAR_CUSTOMIZATION_BASE : public RESETTABLE_PANEL
public:
PANEL_TOOLBAR_CUSTOMIZATION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
PANEL_TOOLBAR_CUSTOMIZATION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 561,333 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_TOOLBAR_CUSTOMIZATION_BASE();