From 5564f4d3168eb7244d824894a218aeff269e832d Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 4 Jan 2025 13:23:49 +0000
Subject: [PATCH] Fix Generate button alignment and gap between outputs.

---
 kicad/dialogs/panel_jobs.cpp      |  5 +++++
 kicad/dialogs/panel_jobs_base.cpp |  3 +++
 kicad/dialogs/panel_jobs_base.fbp | 10 ++++++++++
 3 files changed, 18 insertions(+)

diff --git a/kicad/dialogs/panel_jobs.cpp b/kicad/dialogs/panel_jobs.cpp
index 9f58debc15..55083a7d74 100644
--- a/kicad/dialogs/panel_jobs.cpp
+++ b/kicad/dialogs/panel_jobs.cpp
@@ -691,7 +691,12 @@ void PANEL_JOBS::addJobOutputPanel( JOBSET_OUTPUT* aOutput )
 {
     PANEL_JOB_OUTPUT* outputPanel = new PANEL_JOB_OUTPUT( m_outputList, this, m_frame,
                                                           m_jobsFile.get(), aOutput );
+
+#if __OSX__
     m_outputListSizer->Add( outputPanel, 0, wxEXPAND, 5 );
+#else
+    m_outputListSizer->Add( outputPanel, 0, wxEXPAND|wxBOTTOM, 5 );
+#endif
 
     m_outputPanelMap[aOutput] = outputPanel;
 
diff --git a/kicad/dialogs/panel_jobs_base.cpp b/kicad/dialogs/panel_jobs_base.cpp
index bba3cfc4bf..9678d01e24 100644
--- a/kicad/dialogs/panel_jobs_base.cpp
+++ b/kicad/dialogs/panel_jobs_base.cpp
@@ -190,6 +190,9 @@ PANEL_JOB_OUTPUT_BASE::PANEL_JOB_OUTPUT_BASE( wxWindow* parent, wxWindowID id, c
 	m_buttonDelete = new STD_BITMAP_BUTTON( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	bSizerButtons->Add( m_buttonDelete, 0, wxALL, 5 );
 
+
+	bSizerButtons->Add( 0, 0, 1, wxEXPAND, 5 );
+
 	m_buttonGenerate = new wxButton( this, wxID_ANY, _("Generate"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerButtons->Add( m_buttonGenerate, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 
diff --git a/kicad/dialogs/panel_jobs_base.fbp b/kicad/dialogs/panel_jobs_base.fbp
index 93922372f5..c37506987e 100644
--- a/kicad/dialogs/panel_jobs_base.fbp
+++ b/kicad/dialogs/panel_jobs_base.fbp
@@ -1243,6 +1243,16 @@
                 <event name="OnButtonClick">OnDelete</event>
               </object>
             </object>
+            <object class="sizeritem" expanded="true">
+              <property name="border">5</property>
+              <property name="flag">wxEXPAND</property>
+              <property name="proportion">1</property>
+              <object class="spacer" expanded="true">
+                <property name="height">0</property>
+                <property name="permission">protected</property>
+                <property name="width">0</property>
+              </object>
+            </object>
             <object class="sizeritem" expanded="true">
               <property name="border">5</property>
               <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>