From 29b80664733feaf66dd87916aa915bd6620832bd Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 24 Feb 2025 11:04:36 +0000
Subject: [PATCH] Minor dialog cleanup.
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20047
---
pcbnew/zone_manager/dialog_zone_manager_base.cpp | 2 +-
pcbnew/zone_manager/dialog_zone_manager_base.fbp | 2 +-
pcbnew/zone_manager/pane_zone_viewer.h | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/pcbnew/zone_manager/dialog_zone_manager_base.cpp b/pcbnew/zone_manager/dialog_zone_manager_base.cpp
index 81a2fdad5b..c0b777fded 100644
--- a/pcbnew/zone_manager/dialog_zone_manager_base.cpp
+++ b/pcbnew/zone_manager/dialog_zone_manager_base.cpp
@@ -99,7 +99,7 @@ DIALOG_ZONE_MANAGER_BASE::DIALOG_ZONE_MANAGER_BASE( wxWindow* parent, wxWindowID
m_sdbSizer->AddButton( m_sdbSizerCancel );
m_sdbSizer->Realize();
- m_sizerBottom->Add( m_sdbSizer, 0, wxEXPAND, 5 );
+ m_sizerBottom->Add( m_sdbSizer, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
m_MainBoxSizer->Add( m_sizerBottom, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
diff --git a/pcbnew/zone_manager/dialog_zone_manager_base.fbp b/pcbnew/zone_manager/dialog_zone_manager_base.fbp
index 60978e03dc..5052908d50 100644
--- a/pcbnew/zone_manager/dialog_zone_manager_base.fbp
+++ b/pcbnew/zone_manager/dialog_zone_manager_base.fbp
@@ -674,7 +674,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
- <property name="flag">wxEXPAND</property>
+ <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="false">
<property name="Apply">0</property>
diff --git a/pcbnew/zone_manager/pane_zone_viewer.h b/pcbnew/zone_manager/pane_zone_viewer.h
index b5dd185899..4911220f04 100644
--- a/pcbnew/zone_manager/pane_zone_viewer.h
+++ b/pcbnew/zone_manager/pane_zone_viewer.h
@@ -31,11 +31,14 @@
#include <wx/window.h>
#include <wx/panel.h>
#include <wx/notebook.h>
+
class wxDataViewCtrl;
class PANEL_ZONE_GAL;
class PCB_BASE_FRAME;
class PANEL_ZONE_GAL_CONTAINER;
class ROW_ICON_PROVIDER;
+
+
class PANE_ZONE_VIEWER : public wxNotebook, public ZONE_SELECTION_CHANGE_NOTIFIER
{
public:
@@ -48,7 +51,6 @@ public:
PANEL_ZONE_GAL* GetZoneGAL() const { return m_zoneGAL; }
-
private:
PCB_BASE_FRAME* m_pcbFrame;
std::unordered_map<int, PANEL_ZONE_GAL_CONTAINER*> m_zoneContainers;