From 38953bf35f5f1dabc9e446aaedd4e770d487b6bb Mon Sep 17 00:00:00 2001
From: Alex Shvartzkop <dudesuchamazing@gmail.com>
Date: Sun, 25 Feb 2024 13:41:36 +0300
Subject: [PATCH] Fix update notice dialog padding.

(cherry picked from commit 1c639714f3d99f6196b1034d5ec6dcfa481953a9)
---
 kicad/dialogs/dialog_update_notice_base.cpp | 6 +++---
 kicad/dialogs/dialog_update_notice_base.fbp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kicad/dialogs/dialog_update_notice_base.cpp b/kicad/dialogs/dialog_update_notice_base.cpp
index 6c674ab822..4b2ac331a7 100644
--- a/kicad/dialogs/dialog_update_notice_base.cpp
+++ b/kicad/dialogs/dialog_update_notice_base.cpp
@@ -52,7 +52,7 @@ DIALOG_UPDATE_NOTICE_BASE::DIALOG_UPDATE_NOTICE_BASE( wxWindow* parent, wxWindow
 	m_skipBtn = new wxButton( this, wxID_ANY, _("Skip this version"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_skipBtn->SetToolTip( _("Override locks and apply the operation on all the items selected.\nAny locked items will remain locked after the operation is complete.") );
 
-	bButtonSizer->Add( m_skipBtn, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 10 );
+	bButtonSizer->Add( m_skipBtn, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
 
 
 	bButtonSizer->Add( 0, 0, 1, wxEXPAND, 5 );
@@ -64,10 +64,10 @@ DIALOG_UPDATE_NOTICE_BASE::DIALOG_UPDATE_NOTICE_BASE( wxWindow* parent, wxWindow
 	bButtonSizer->Add( m_btnDetailsPage, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP, 5 );
 
 	m_btnDownloadPage = new wxButton( this, wxID_ANY, _("Open Downloads Page"), wxDefaultPosition, wxDefaultSize, 0 );
-	bButtonSizer->Add( m_btnDownloadPage, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP, 5 );
+	bButtonSizer->Add( m_btnDownloadPage, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 );
 
 
-	bSizerMain->Add( bButtonSizer, 0, wxEXPAND, 5 );
+	bSizerMain->Add( bButtonSizer, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
 
 
 	this->SetSizer( bSizerMain );
diff --git a/kicad/dialogs/dialog_update_notice_base.fbp b/kicad/dialogs/dialog_update_notice_base.fbp
index d8d92102cd..0d53615679 100644
--- a/kicad/dialogs/dialog_update_notice_base.fbp
+++ b/kicad/dialogs/dialog_update_notice_base.fbp
@@ -286,7 +286,7 @@
         </object>
         <object class="sizeritem" expanded="true">
           <property name="border">5</property>
-          <property name="flag">wxEXPAND</property>
+          <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
           <property name="proportion">0</property>
           <object class="wxBoxSizer" expanded="true">
             <property name="minimum_size"></property>
@@ -294,8 +294,8 @@
             <property name="orient">wxHORIZONTAL</property>
             <property name="permission">none</property>
             <object class="sizeritem" expanded="false">
-              <property name="border">10</property>
-              <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+              <property name="border">5</property>
+              <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
               <property name="proportion">0</property>
               <object class="wxButton" expanded="false">
                 <property name="BottomDockable">1</property>
@@ -530,7 +530,7 @@
             </object>
             <object class="sizeritem" expanded="true">
               <property name="border">5</property>
-              <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxTOP</property>
+              <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP</property>
               <property name="proportion">0</property>
               <object class="wxButton" expanded="true">
                 <property name="BottomDockable">1</property>