electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable horizontal scrolling in launcher panel, move paddings to scrollable area.

Browse Source
This commit is contained in:
Alex Shvartzkop
2024-12-22 16:05:11 +03:00
parent 7ef3c6d7df
commit 1bae5997fe
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kicad/dialogs/panel_kicad_launcher_base.cpp
+11 -5
View File
@@ -14,17 +14,23 @@ PANEL_KICAD_LAUNCHER_BASE::PANEL_KICAD_LAUNCHER_BASE( wxWindow* parent, wxWindow
wxBoxSizer* bSizer2;
bSizer2 = new wxBoxSizer( wxVERTICAL );
m_scrolledWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
m_scrolledWindow->SetScrollRate( 5, 5 );
m_scrolledWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL );
m_scrolledWindow->SetScrollRate( 0, 5 );
wxBoxSizer* bSizerInner;
bSizerInner = new wxBoxSizer( wxVERTICAL );
m_toolsSizer = new wxFlexGridSizer( 0, 2, 2, 10 );
m_toolsSizer->SetFlexibleDirection( wxBOTH );
m_toolsSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_scrolledWindow->SetSizer( m_toolsSizer );
bSizerInner->Add( m_toolsSizer, 1, wxALL|wxEXPAND, 5 );
m_scrolledWindow->SetSizer( bSizerInner );
m_scrolledWindow->Layout();
m_toolsSizer->Fit( m_scrolledWindow );
bSizer2->Add( m_scrolledWindow, 1, wxEXPAND | wxALL, 5 );
bSizerInner->Fit( m_scrolledWindow );
bSizer2->Add( m_scrolledWindow, 1, wxEXPAND, 5 );
this->SetSizer( bSizer2 );
kicad/dialogs/panel_kicad_launcher_base.fbp
+25 -14
View File
@@ -62,7 +62,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxScrolledWindow" expanded="true">
<property name="BottomDockable">1</property>
@@ -108,7 +108,7 @@
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="scroll_rate_x">5</property>
<property name="scroll_rate_x">0</property>
<property name="scroll_rate_y">5</property>
<property name="show">1</property>
<property name="size"></property>
@@ -117,19 +117,30 @@
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxHSCROLL|wxVSCROLL</property>
<object class="wxFlexGridSizer" expanded="true">
<property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">10</property>
<property name="window_style">wxVSCROLL</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="name">m_toolsSizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="rows">0</property>
<property name="vgap">2</property>
<property name="name">bSizerInner</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="true">
<property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablerows"></property>
<property name="hgap">10</property>
<property name="minimum_size"></property>
<property name="name">m_toolsSizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">protected</property>
<property name="rows">0</property>
<property name="vgap">2</property>
</object>
</object>
</object>
</object>
</object>