From 141de7ac11325f08d649bfb6f1a958fd5cd91ebb Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Wed, 28 Feb 2024 21:58:29 +0000
Subject: [PATCH] Even up spacing in dialog.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16391
---
 pcbnew/dialogs/dialog_create_array_base.cpp | 8 ++++----
 pcbnew/dialogs/dialog_create_array_base.fbp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pcbnew/dialogs/dialog_create_array_base.cpp b/pcbnew/dialogs/dialog_create_array_base.cpp
index 9e911213b8..481f01dc65 100644
--- a/pcbnew/dialogs/dialog_create_array_base.cpp
+++ b/pcbnew/dialogs/dialog_create_array_base.cpp
@@ -41,7 +41,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID
 	m_labelNx->Wrap( -1 );
 	m_labelNx->SetToolTip( _("Number of columns") );
 
-	fgSizerGridSize->Add( m_labelNx, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	fgSizerGridSize->Add( m_labelNx, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_entryNx = new TEXT_CTRL_EVAL( sbSizerGridSize->GetStaticBox(), wxID_ANY, _("5"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_entryNx->SetMinSize( wxSize( 60,-1 ) );
@@ -52,7 +52,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID
 	m_labelNy->Wrap( -1 );
 	m_labelNy->SetToolTip( _("Number of rows") );
 
-	fgSizerGridSize->Add( m_labelNy, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	fgSizerGridSize->Add( m_labelNy, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
 	m_entryNy = new TEXT_CTRL_EVAL( sbSizerGridSize->GetStaticBox(), wxID_ANY, _("5"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_entryNy->SetToolTip( _("Number of rows") );
@@ -372,7 +372,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID
 
 	m_labelCircRadius = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Radius from center to reference position:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_labelCircRadius->Wrap( -1 );
-	bSizerRadius->Add( m_labelCircRadius, 0, wxTOP, 5 );
+	bSizerRadius->Add( m_labelCircRadius, 0, wxTOP|wxRIGHT, 5 );
 
 	wxBoxSizer* bSizerRadiusValue;
 	bSizerRadiusValue = new wxBoxSizer( wxHORIZONTAL );
@@ -391,7 +391,7 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID
 
 	m_labelCircCenterAngle = new wxStaticText( sbSizerCircParams->GetStaticBox(), wxID_ANY, _("Angle from center to reference position:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_labelCircCenterAngle->Wrap( -1 );
-	bSizerRadius->Add( m_labelCircCenterAngle, 0, wxTOP, 5 );
+	bSizerRadius->Add( m_labelCircCenterAngle, 0, wxTOP|wxRIGHT, 5 );
 
 	wxBoxSizer* bSizerRadiusValue1;
 	bSizerRadiusValue1 = new wxBoxSizer( wxHORIZONTAL );
diff --git a/pcbnew/dialogs/dialog_create_array_base.fbp b/pcbnew/dialogs/dialog_create_array_base.fbp
index dd124d7aa1..4b971ee53e 100644
--- a/pcbnew/dialogs/dialog_create_array_base.fbp
+++ b/pcbnew/dialogs/dialog_create_array_base.fbp
@@ -230,7 +230,7 @@
                                   <property name="vgap">5</property>
                                   <object class="sizeritem" expanded="false">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
                                     <property name="proportion">0</property>
                                     <object class="wxStaticText" expanded="false">
                                       <property name="BottomDockable">1</property>
@@ -358,7 +358,7 @@
                                   </object>
                                   <object class="sizeritem" expanded="false">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
                                     <property name="proportion">0</property>
                                     <object class="wxStaticText" expanded="false">
                                       <property name="BottomDockable">1</property>
@@ -3702,7 +3702,7 @@
                                   <property name="permission">none</property>
                                   <object class="sizeritem" expanded="false">
                                     <property name="border">5</property>
-                                    <property name="flag">wxTOP</property>
+                                    <property name="flag">wxTOP|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxStaticText" expanded="false">
                                       <property name="BottomDockable">1</property>
@@ -3903,7 +3903,7 @@
                                   </object>
                                   <object class="sizeritem" expanded="false">
                                     <property name="border">5</property>
-                                    <property name="flag">wxTOP</property>
+                                    <property name="flag">wxTOP|wxRIGHT</property>
                                     <property name="proportion">0</property>
                                     <object class="wxStaticText" expanded="false">
                                       <property name="BottomDockable">1</property>