From f5c5b00e40f215a5fcb8e8a37efebe91c96d7f51 Mon Sep 17 00:00:00 2001
From: Wayne Stambaugh <stambaughw@gmail.com>
Date: Tue, 3 Jan 2023 19:02:59 -0500
Subject: [PATCH] Fix schematic annotation dialog bitmap layout issue.

---
 eeschema/dialogs/dialog_annotate_base.cpp |  7 ++-----
 eeschema/dialogs/dialog_annotate_base.fbp | 14 ++------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp
index ed44cdeaa2..f3d1298054 100644
--- a/eeschema/dialogs/dialog_annotate_base.cpp
+++ b/eeschema/dialogs/dialog_annotate_base.cpp
@@ -5,8 +5,8 @@
 // PLEASE DO *NOT* EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "widgets/wx_infobar.h"
 #include "widgets/wx_html_report_panel.h"
+#include "widgets/wx_infobar.h"
 
 #include "dialog_annotate_base.h"
 
@@ -67,7 +67,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
 	bSizerXpos->Add( annotate_down_right_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
 
-	sbSizer1->Add( bSizerXpos, 0, wxEXPAND, 5 );
+	sbSizer1->Add( bSizerXpos, 0, wxBOTTOM|wxEXPAND, 5 );
 
 	wxBoxSizer* bSizerYpos;
 	bSizerYpos = new wxBoxSizer( wxHORIZONTAL );
@@ -75,9 +75,6 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
 	m_rbSortBy_Y_Position = new wxRadioButton( sbSizer1->GetStaticBox(), ID_SORT_BY_Y_POSITION, _("Sort symbols by &Y position"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerYpos->Add( m_rbSortBy_Y_Position, 0, wxALIGN_CENTER_VERTICAL, 3 );
 
-
-	bSizerYpos->Add( 0, 0, 1, 0, 5 );
-
 	annotate_right_down_bitmap = new wxStaticBitmap( sbSizer1->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerYpos->Add( annotate_right_down_bitmap, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
diff --git a/eeschema/dialogs/dialog_annotate_base.fbp b/eeschema/dialogs/dialog_annotate_base.fbp
index 494f55daee..8756f9076d 100644
--- a/eeschema/dialogs/dialog_annotate_base.fbp
+++ b/eeschema/dialogs/dialog_annotate_base.fbp
@@ -114,7 +114,7 @@
                         <property name="show">1</property>
                         <property name="show_effect">wxSHOW_EFFECT_NONE</property>
                         <property name="size"></property>
-                        <property name="subclass">WX_INFOBAR; widgets/infobar.h; forward_declare</property>
+                        <property name="subclass">WX_INFOBAR; widgets/wx_infobar.h; forward_declare</property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="window_extra_style"></property>
@@ -431,7 +431,7 @@
                                         <property name="permission">none</property>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxEXPAND</property>
+                                            <property name="flag">wxBOTTOM|wxEXPAND</property>
                                             <property name="proportion">0</property>
                                             <object class="wxBoxSizer" expanded="1">
                                                 <property name="minimum_size"></property>
@@ -637,16 +637,6 @@
                                                         <event name="OnRadioButton">OnOptionChanged</event>
                                                     </object>
                                                 </object>
-                                                <object class="sizeritem" expanded="0">
-                                                    <property name="border">5</property>
-                                                    <property name="flag"></property>
-                                                    <property name="proportion">1</property>
-                                                    <object class="spacer" expanded="0">
-                                                        <property name="height">0</property>
-                                                        <property name="permission">protected</property>
-                                                        <property name="width">0</property>
-                                                    </object>
-                                                </object>
                                                 <object class="sizeritem" expanded="0">
                                                     <property name="border">5</property>
                                                     <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT</property>