From 7f307afb04b3714884f49429e74f438a036b4b5a Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 23 Jan 2025 11:09:10 +0000
Subject: [PATCH] Adjust layout of Find dialogs.

---
 .../dialogs/dialog_schematic_find_base.cpp    | 15 +++++++------
 .../dialogs/dialog_schematic_find_base.fbp    | 22 +++++++++----------
 pcbnew/dialogs/dialog_find_base.cpp           | 12 +++++-----
 pcbnew/dialogs/dialog_find_base.fbp           | 12 +++++-----
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/eeschema/dialogs/dialog_schematic_find_base.cpp b/eeschema/dialogs/dialog_schematic_find_base.cpp
index ad7e4a0b2c..aeae863f5a 100644
--- a/eeschema/dialogs/dialog_schematic_find_base.cpp
+++ b/eeschema/dialogs/dialog_schematic_find_base.cpp
@@ -76,8 +76,9 @@ DIALOG_SCH_FIND_BASE::DIALOG_SCH_FIND_BASE( wxWindow* parent, wxWindowID id, con
 
 	wxGridBagSizer* gbSizer2;
 	gbSizer2 = new wxGridBagSizer( 0, 20 );
-	gbSizer2->SetFlexibleDirection( wxHORIZONTAL );
+	gbSizer2->SetFlexibleDirection( wxVERTICAL );
 	gbSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_NONE );
+	gbSizer2->SetEmptyCellSize( wxSize( -1,8 ) );
 
 	m_checkMatchCase = new wxCheckBox( this, wxID_ANY, _("Match &case"), wxDefaultPosition, wxDefaultSize, 0 );
 	gbSizer2->Add( m_checkMatchCase, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
@@ -90,24 +91,24 @@ DIALOG_SCH_FIND_BASE::DIALOG_SCH_FIND_BASE( wxWindow* parent, wxWindowID id, con
 	gbSizer2->Add( m_checkWildcardMatch, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
 
 	m_checkAllPins = new wxCheckBox( this, wxID_ANY, _("Search pin &names and numbers"), wxDefaultPosition, wxDefaultSize, 0 );
-	gbSizer2->Add( m_checkAllPins, wxGBPosition( 1, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	gbSizer2->Add( m_checkAllPins, wxGBPosition( 2, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_checkAllFields = new wxCheckBox( this, wxID_ANY, _("Search &hidden fields"), wxDefaultPosition, wxDefaultSize, 0 );
-	gbSizer2->Add( m_checkAllFields, wxGBPosition( 2, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	gbSizer2->Add( m_checkAllFields, wxGBPosition( 3, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_checkCurrentSheetOnly = new wxCheckBox( this, wxID_ANY, _("Search the current &sheet only"), wxDefaultPosition, wxDefaultSize, 0 );
-	gbSizer2->Add( m_checkCurrentSheetOnly, wxGBPosition( 3, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	gbSizer2->Add( m_checkCurrentSheetOnly, wxGBPosition( 4, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_checkSelectedOnly = new wxCheckBox( this, wxID_ANY, _("Search the current selection &only"), wxDefaultPosition, wxDefaultSize, 0 );
-	gbSizer2->Add( m_checkSelectedOnly, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	gbSizer2->Add( m_checkSelectedOnly, wxGBPosition( 5, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_checkReplaceReferences = new wxCheckBox( this, wxID_ANY, _("Replace matches in reference designators"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_checkReplaceReferences->Hide();
 
-	gbSizer2->Add( m_checkReplaceReferences, wxGBPosition( 5, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	gbSizer2->Add( m_checkReplaceReferences, wxGBPosition( 6, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-	leftSizer->Add( gbSizer2, 1, wxEXPAND, 5 );
+	leftSizer->Add( gbSizer2, 1, wxEXPAND|wxTOP, 5 );
 
 
 	topSizer->Add( leftSizer, 1, wxEXPAND|wxALL, 5 );
diff --git a/eeschema/dialogs/dialog_schematic_find_base.fbp b/eeschema/dialogs/dialog_schematic_find_base.fbp
index 628fae344e..4ec6c4bf0d 100644
--- a/eeschema/dialogs/dialog_schematic_find_base.fbp
+++ b/eeschema/dialogs/dialog_schematic_find_base.fbp
@@ -571,15 +571,15 @@
                 </object>
                 <object class="sizeritem" expanded="true">
                   <property name="border">5</property>
-                  <property name="flag">wxEXPAND</property>
+                  <property name="flag">wxEXPAND|wxTOP</property>
                   <property name="proportion">1</property>
                   <object class="wxGridBagSizer" expanded="true">
-                    <property name="empty_cell_size"></property>
-                    <property name="flexible_direction">wxHORIZONTAL</property>
+                    <property name="empty_cell_size">-1,8</property>
+                    <property name="flexible_direction">wxVERTICAL</property>
                     <property name="growablecols"></property>
                     <property name="growablerows"></property>
                     <property name="hgap">20</property>
-                    <property name="minimum_size"></property>
+                    <property name="minimum_size">-1,-1</property>
                     <property name="name">gbSizer2</property>
                     <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_NONE</property>
                     <property name="permission">none</property>
@@ -796,7 +796,7 @@
                       <property name="colspan">3</property>
                       <property name="column">0</property>
                       <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
-                      <property name="row">1</property>
+                      <property name="row">2</property>
                       <property name="rowspan">1</property>
                       <object class="wxCheckBox" expanded="false">
                         <property name="BottomDockable">1</property>
@@ -865,7 +865,7 @@
                       <property name="colspan">3</property>
                       <property name="column">0</property>
                       <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
-                      <property name="row">2</property>
+                      <property name="row">3</property>
                       <property name="rowspan">1</property>
                       <object class="wxCheckBox" expanded="false">
                         <property name="BottomDockable">1</property>
@@ -934,7 +934,7 @@
                       <property name="colspan">3</property>
                       <property name="column">0</property>
                       <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
-                      <property name="row">3</property>
+                      <property name="row">4</property>
                       <property name="rowspan">1</property>
                       <object class="wxCheckBox" expanded="false">
                         <property name="BottomDockable">1</property>
@@ -1000,10 +1000,10 @@
                     </object>
                     <object class="gbsizeritem" expanded="true">
                       <property name="border">5</property>
-                      <property name="colspan">1</property>
+                      <property name="colspan">3</property>
                       <property name="column">0</property>
                       <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
-                      <property name="row">4</property>
+                      <property name="row">5</property>
                       <property name="rowspan">1</property>
                       <object class="wxCheckBox" expanded="true">
                         <property name="BottomDockable">1</property>
@@ -1072,7 +1072,7 @@
                       <property name="colspan">3</property>
                       <property name="column">0</property>
                       <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
-                      <property name="row">5</property>
+                      <property name="row">6</property>
                       <property name="rowspan">1</property>
                       <object class="wxCheckBox" expanded="true">
                         <property name="BottomDockable">1</property>
@@ -1110,7 +1110,7 @@
                         <property name="maximum_size"></property>
                         <property name="min_size"></property>
                         <property name="minimize_button">0</property>
-                        <property name="minimum_size"></property>
+                        <property name="minimum_size">-1,-1</property>
                         <property name="moveable">1</property>
                         <property name="name">m_checkReplaceReferences</property>
                         <property name="pane_border">1</property>
diff --git a/pcbnew/dialogs/dialog_find_base.cpp b/pcbnew/dialogs/dialog_find_base.cpp
index 7c16df5a01..00b653a764 100644
--- a/pcbnew/dialogs/dialog_find_base.cpp
+++ b/pcbnew/dialogs/dialog_find_base.cpp
@@ -65,19 +65,19 @@ DIALOG_FIND_BASE::DIALOG_FIND_BASE( wxWindow* parent, wxWindowID id, const wxStr
 
 	m_includeValues = new wxCheckBox( this, wxID_ANY, _("Search footprint &values"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_includeValues->SetValue(true);
-	sizerInclude->Add( m_includeValues, 0, wxALL, 5 );
+	sizerInclude->Add( m_includeValues, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_includeTexts = new wxCheckBox( this, wxID_ANY, _("Search &other text items"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_includeTexts->SetValue(true);
-	sizerInclude->Add( m_includeTexts, 0, wxALL, 5 );
+	sizerInclude->Add( m_includeTexts, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_includeMarkers = new wxCheckBox( this, wxID_ANY, _("Search DRC &markers"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_includeMarkers->SetValue(true);
-	sizerInclude->Add( m_includeMarkers, 0, wxALL, 5 );
+	sizerInclude->Add( m_includeMarkers, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 	m_includeNets = new wxCheckBox( this, wxID_ANY, _("Search &net names"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_includeNets->SetValue(true);
-	sizerInclude->Add( m_includeNets, 0, wxALL, 5 );
+	sizerInclude->Add( m_includeNets, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
 	leftSizer->Add( sizerInclude, 0, wxEXPAND, 5 );
@@ -106,7 +106,7 @@ DIALOG_FIND_BASE::DIALOG_FIND_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	topSizer->Add( buttonSizer, 0, 0, 5 );
 
 
-	bSizer10->Add( topSizer, 0, wxEXPAND, 5 );
+	bSizer10->Add( topSizer, 0, wxALL|wxEXPAND, 5 );
 
 	wxStaticLine* staticline;
 	staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -120,7 +120,7 @@ DIALOG_FIND_BASE::DIALOG_FIND_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	sizerStatus->Add( m_status, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
-	bSizer10->Add( sizerStatus, 0, wxEXPAND, 5 );
+	bSizer10->Add( sizerStatus, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
 
 	this->SetSizer( bSizer10 );
diff --git a/pcbnew/dialogs/dialog_find_base.fbp b/pcbnew/dialogs/dialog_find_base.fbp
index 7c3bac7be5..8d4f0399ec 100644
--- a/pcbnew/dialogs/dialog_find_base.fbp
+++ b/pcbnew/dialogs/dialog_find_base.fbp
@@ -67,7 +67,7 @@
         <property name="permission">none</property>
         <object class="sizeritem" expanded="true">
           <property name="border">5</property>
-          <property name="flag">wxEXPAND</property>
+          <property name="flag">wxALL|wxEXPAND</property>
           <property name="proportion">0</property>
           <object class="wxBoxSizer" expanded="true">
             <property name="minimum_size"></property>
@@ -570,7 +570,7 @@
                     </object>
                     <object class="sizeritem" expanded="false">
                       <property name="border">5</property>
-                      <property name="flag">wxALL</property>
+                      <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
                       <property name="proportion">0</property>
                       <object class="wxCheckBox" expanded="false">
                         <property name="BottomDockable">1</property>
@@ -635,7 +635,7 @@
                     </object>
                     <object class="sizeritem" expanded="false">
                       <property name="border">5</property>
-                      <property name="flag">wxALL</property>
+                      <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
                       <property name="proportion">0</property>
                       <object class="wxCheckBox" expanded="false">
                         <property name="BottomDockable">1</property>
@@ -700,7 +700,7 @@
                     </object>
                     <object class="sizeritem" expanded="false">
                       <property name="border">5</property>
-                      <property name="flag">wxALL</property>
+                      <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
                       <property name="proportion">0</property>
                       <object class="wxCheckBox" expanded="false">
                         <property name="BottomDockable">1</property>
@@ -765,7 +765,7 @@
                     </object>
                     <object class="sizeritem" expanded="false">
                       <property name="border">5</property>
-                      <property name="flag">wxALL</property>
+                      <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
                       <property name="proportion">0</property>
                       <object class="wxCheckBox" expanded="false">
                         <property name="BottomDockable">1</property>
@@ -1206,7 +1206,7 @@
         </object>
         <object class="sizeritem" expanded="true">
           <property name="border">5</property>
-          <property name="flag">wxEXPAND</property>
+          <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
           <property name="proportion">0</property>
           <object class="wxBoxSizer" expanded="true">
             <property name="minimum_size"></property>