From 38e646622448d7004a0f12b57d98911d3864bf6b Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Fri, 3 Oct 2025 13:25:21 -0700 Subject: [PATCH] Respace E-series in tunr Fixes https://gitlab.com/kicad/code/kicad/-/issues/21867 --- eeschema/widgets/tuner_slider_base.cpp | 16 +++++---------- eeschema/widgets/tuner_slider_base.fbp | 28 ++++---------------------- eeschema/widgets/tuner_slider_base.h | 2 +- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/eeschema/widgets/tuner_slider_base.cpp b/eeschema/widgets/tuner_slider_base.cpp index e2b341019a..5897babe63 100644 --- a/eeschema/widgets/tuner_slider_base.cpp +++ b/eeschema/widgets/tuner_slider_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-75-g9786507b-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -66,28 +66,22 @@ TUNER_SLIDER_BASE::TUNER_SLIDER_BASE( wxWindow* parent, wxWindowID id, const wxP m_separator = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE ); m_separator->SetToolTip( _("Bold") ); - bSizer7->Add( m_separator, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizer7->Add( m_separator, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_e48 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE ); m_e48->SetToolTip( _("Limit to E48 series values.") ); - bSizer7->Add( m_e48, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - - bSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); + bSizer7->Add( m_e48, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_e96 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE ); m_e96->SetToolTip( _("Limit to E96 series values") ); - bSizer7->Add( m_e96, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - - bSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); + bSizer7->Add( m_e96, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_e192 = new BITMAP_BUTTON( m_panel1, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|wxBORDER_NONE ); m_e192->SetToolTip( _("Limit to E192 series values") ); - bSizer7->Add( m_e192, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); + bSizer7->Add( m_e192, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); bSizer6->Add( bSizer7, 0, wxEXPAND|wxTOP|wxBOTTOM, 2 ); diff --git a/eeschema/widgets/tuner_slider_base.fbp b/eeschema/widgets/tuner_slider_base.fbp index 828be2f729..e625ebc84c 100644 --- a/eeschema/widgets/tuner_slider_base.fbp +++ b/eeschema/widgets/tuner_slider_base.fbp @@ -543,7 +543,7 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -617,7 +617,7 @@ 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -692,17 +692,7 @@ 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -777,17 +767,7 @@ 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxRIGHT|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 diff --git a/eeschema/widgets/tuner_slider_base.h b/eeschema/widgets/tuner_slider_base.h index a0a244ca81..1975e64986 100644 --- a/eeschema/widgets/tuner_slider_base.h +++ b/eeschema/widgets/tuner_slider_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.2.1-75-g9786507b-dirty) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6a-dirty) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!