From 103443f496b595fd9038613bb813562b4b6e4d62 Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Sat, 15 Aug 2020 19:20:49 -0400
Subject: [PATCH] Back out some spacing changes for MacOS

These were too aggressive on other platforms
---
 pcbnew/widgets/appearance_controls_base.cpp | 12 ++++++------
 pcbnew/widgets/appearance_controls_base.fbp | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pcbnew/widgets/appearance_controls_base.cpp b/pcbnew/widgets/appearance_controls_base.cpp
index e3a993adef..210a11f5e7 100644
--- a/pcbnew/widgets/appearance_controls_base.cpp
+++ b/pcbnew/widgets/appearance_controls_base.cpp
@@ -30,7 +30,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
 	m_windowLayers->SetSizer( m_layers_outer_sizer );
 	m_windowLayers->Layout();
 	m_layers_outer_sizer->Fit( m_windowLayers );
-	m_panelLayersSizer->Add( m_windowLayers, 1, wxEXPAND, 5 );
+	m_panelLayersSizer->Add( m_windowLayers, 1, wxEXPAND|wxTOP, 5 );
 
 	m_paneLayerDisplay = new wxCollapsiblePane( m_panelLayers, wxID_ANY, wxT("Layer Display Options"), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE|wxCP_NO_TLW_RESIZE );
 	m_paneLayerDisplay->Collapse( true );
@@ -74,13 +74,13 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
 	m_paneLayerDisplay->GetPane()->SetSizer( bSizer121 );
 	m_paneLayerDisplay->GetPane()->Layout();
 	bSizer121->Fit( m_paneLayerDisplay->GetPane() );
-	m_panelLayersSizer->Add( m_paneLayerDisplay, 0, wxEXPAND|wxTOP, 5 );
+	m_panelLayersSizer->Add( m_paneLayerDisplay, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
 
 
 	m_panelLayers->SetSizer( m_panelLayersSizer );
 	m_panelLayers->Layout();
 	m_panelLayersSizer->Fit( m_panelLayers );
-	m_notebook->AddPage( m_panelLayers, wxT("Layers"), false );
+	m_notebook->AddPage( m_panelLayers, wxT("Layers"), true );
 	m_panelObjects = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	m_panelObjects->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
 
@@ -236,7 +236,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
 	m_panelNetsAndClasses->SetSizer( bSizer16 );
 	m_panelNetsAndClasses->Layout();
 	bSizer16->Fit( m_panelNetsAndClasses );
-	m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), true );
+	m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), false );
 
 	m_sizerOuter->Add( m_notebook, 1, wxEXPAND, 5 );
 
@@ -247,13 +247,13 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
 	int m_cbLayerPresetsNChoices = sizeof( m_cbLayerPresetsChoices ) / sizeof( wxString );
 	m_cbLayerPresets = new wxChoice( presetsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbLayerPresetsNChoices, m_cbLayerPresetsChoices, 0 );
 	m_cbLayerPresets->SetSelection( 1 );
-	presetsSizer->Add( m_cbLayerPresets, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	presetsSizer->Add( m_cbLayerPresets, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 	m_btnDeletePreset = new wxBitmapButton( presetsSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	m_btnDeletePreset->Enable( false );
 	m_btnDeletePreset->SetToolTip( wxT("Delete this layer preset") );
 
-	presetsSizer->Add( m_btnDeletePreset, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	presetsSizer->Add( m_btnDeletePreset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
 
 	m_sizerOuter->Add( presetsSizer, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
diff --git a/pcbnew/widgets/appearance_controls_base.fbp b/pcbnew/widgets/appearance_controls_base.fbp
index d7149a811f..867ee6e72c 100644
--- a/pcbnew/widgets/appearance_controls_base.fbp
+++ b/pcbnew/widgets/appearance_controls_base.fbp
@@ -115,7 +115,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Layers</property>
-                            <property name="select">0</property>
+                            <property name="select">1</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
@@ -174,7 +174,7 @@
                                     <property name="permission">protected</property>
                                     <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
-                                        <property name="flag">wxEXPAND</property>
+                                        <property name="flag">wxEXPAND|wxTOP</property>
                                         <property name="proportion">1</property>
                                         <object class="wxScrolledWindow" expanded="0">
                                             <property name="BottomDockable">1</property>
@@ -239,7 +239,7 @@
                                     </object>
                                     <object class="sizeritem" expanded="1">
                                         <property name="border">5</property>
-                                        <property name="flag">wxEXPAND|wxTOP</property>
+                                        <property name="flag">wxBOTTOM|wxEXPAND|wxTOP</property>
                                         <property name="proportion">0</property>
                                         <object class="wxCollapsiblePane" expanded="1">
                                             <property name="BottomDockable">1</property>
@@ -835,7 +835,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Nets</property>
-                            <property name="select">1</property>
+                            <property name="select">0</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="BottomDockable">1</property>
                                 <property name="LeftDockable">1</property>
@@ -1911,7 +1911,7 @@
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                             <property name="proportion">1</property>
                             <object class="wxChoice" expanded="1">
                                 <property name="BottomDockable">1</property>
@@ -1976,7 +1976,7 @@
                         </object>
                         <object class="sizeritem" expanded="1">
                             <property name="border">5</property>
-                            <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
                             <property name="proportion">0</property>
                             <object class="wxBitmapButton" expanded="1">
                                 <property name="BottomDockable">1</property>