From b6a0a7cd142b20138bd1f94d6bbe50e19f62cf28 Mon Sep 17 00:00:00 2001 From: dsa-t <dudesuchamazing@gmail.com> Date: Tue, 25 Feb 2025 20:23:17 +0000 Subject: [PATCH] Auto-size PANEL_SETUP_LAYERS_BASE. Fixes https://gitlab.com/kicad/code/kicad/-/issues/20106 (cherry picked from commit 8ef8ca4d3931a98b6f162078a07f7a4b1ea59970) Co-authored-by: Alex Shvartzkop <dudesuchamazing@gmail.com> --- pcbnew/dialogs/panel_setup_layers_base.cpp | 3 ++- pcbnew/dialogs/panel_setup_layers_base.fbp | 2 +- pcbnew/dialogs/panel_setup_layers_base.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pcbnew/dialogs/panel_setup_layers_base.cpp b/pcbnew/dialogs/panel_setup_layers_base.cpp index 84d4101879..5f855e559c 100644 --- a/pcbnew/dialogs/panel_setup_layers_base.cpp +++ b/pcbnew/dialogs/panel_setup_layers_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -52,6 +52,7 @@ PANEL_SETUP_LAYERS_BASE::PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID i this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); // Connect Events m_addUserDefinedLayerButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_LAYERS_BASE::addUserDefinedLayer ), NULL, this ); diff --git a/pcbnew/dialogs/panel_setup_layers_base.fbp b/pcbnew/dialogs/panel_setup_layers_base.fbp index 8634de5b95..91dac177dc 100644 --- a/pcbnew/dialogs/panel_setup_layers_base.fbp +++ b/pcbnew/dialogs/panel_setup_layers_base.fbp @@ -48,7 +48,7 @@ <property name="minimum_size"></property> <property name="name">PANEL_SETUP_LAYERS_BASE</property> <property name="pos"></property> - <property name="size">589,704</property> + <property name="size">-1,-1</property> <property name="subclass">; forward_declare</property> <property name="tooltip"></property> <property name="two_step_creation">0</property> diff --git a/pcbnew/dialogs/panel_setup_layers_base.h b/pcbnew/dialogs/panel_setup_layers_base.h index cb31c1b70e..aede155d1c 100644 --- a/pcbnew/dialogs/panel_setup_layers_base.h +++ b/pcbnew/dialogs/panel_setup_layers_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -45,7 +45,7 @@ class PANEL_SETUP_LAYERS_BASE : public wxPanel public: - PANEL_SETUP_LAYERS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 589,704 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_SETUP_LAYERS_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_SETUP_LAYERS_BASE();