From 93c018612d03060e5cb495e851d0aae0d8a72187 Mon Sep 17 00:00:00 2001
From: evairson <eva.herson@me.com>
Date: Mon, 6 Apr 2026 18:29:13 +0200
Subject: [PATCH] feat(gui): make the Emulated USB Devices window resize per
 page

---
 .../EmulatedUSBDeviceFrame.cpp                | 48 +++++++++++++++----
 .../EmulatedUSBDeviceFrame.h                  |  4 +-
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp b/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp
index 5015fc5d..44133e70 100644
--- a/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp
+++ b/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp
@@ -42,21 +42,55 @@ EmulatedUSBDeviceFrame::EmulatedUSBDeviceFrame(wxWindow* parent)
 	auto& config = GetConfig();
 
 	auto* sizer = new wxBoxSizer(wxVERTICAL);
-	auto* notebook = new wxNotebook(this, wxID_ANY);
+	m_notebook = new wxNotebook(this, wxID_ANY);
 
-	notebook->AddPage(AddSkylanderPage(notebook), _("Skylanders Portal"));
-	notebook->AddPage(AddInfinityPage(notebook), _("Infinity Base"));
-	notebook->AddPage(AddDimensionsPage(notebook), _("Dimensions Toypad"));
+	m_notebook->AddPage(AddSkylanderPage(m_notebook), _("Skylanders Portal"));
+	m_notebook->AddPage(AddInfinityPage(m_notebook), _("Infinity Base"));
+	m_notebook->AddPage(AddDimensionsPage(m_notebook), _("Dimensions Toypad"));
+	m_notebook->Bind(wxEVT_NOTEBOOK_PAGE_CHANGED, [this](wxBookCtrlEvent& event) {
+		UpdateWindowSizeForCurrentPage();
+		event.Skip();
+	});
 
-	sizer->Add(notebook, 1, wxEXPAND | wxALL, 2);
+	sizer->Add(m_notebook, 1, wxEXPAND | wxALL, 2);
 
-	SetSizerAndFit(sizer);
+	SetSizer(sizer);
+	sizer->Fit(this);
+	m_notebook->SetFitToCurrentPage(true);
+	UpdateWindowSizeForCurrentPage();
 	Layout();
 	Centre(wxBOTH);
 }
 
 EmulatedUSBDeviceFrame::~EmulatedUSBDeviceFrame() {}
 
+void EmulatedUSBDeviceFrame::UpdateWindowSizeForCurrentPage()
+{
+	if (!m_notebook || !GetSizer())
+		return;
+
+	m_notebook->InvalidateBestSize();
+
+	wxSize frameSize = GetSize();
+	const wxSize minSize = GetSizer()->ComputeFittingWindowSize(this);
+	SetMinSize(minSize);
+	bool shouldGrow = false;
+
+	if (frameSize.x < minSize.x)
+	{
+		frameSize.x = minSize.x;
+		shouldGrow = true;
+	}
+	if (frameSize.y < minSize.y)
+	{
+		frameSize.y = minSize.y;
+		shouldGrow = true;
+	}
+
+	if (shouldGrow)
+		SetSize(frameSize);
+}
+
 wxPanel* EmulatedUSBDeviceFrame::AddSkylanderPage(wxNotebook* notebook)
 {
 	auto* panel = new wxPanel(notebook);
@@ -177,7 +211,6 @@ wxBoxSizer* EmulatedUSBDeviceFrame::AddSkylanderRow(uint8 rowNumber, wxStaticBox
 	m_skylanderSlots[rowNumber] =
 		new wxTextCtrl(box, wxID_ANY, _("None"), wxDefaultPosition, wxDefaultSize,
 					   wxTE_READONLY);
-	m_skylanderSlots[rowNumber]->SetMinSize(wxSize(150, -1));
 	m_skylanderSlots[rowNumber]->Disable();
 	row->Add(m_skylanderSlots[rowNumber], 1, wxEXPAND | wxALL, 2);
 	auto* loadButton = new wxButton(box, wxID_ANY, _("Load"));
@@ -207,7 +240,6 @@ wxBoxSizer* EmulatedUSBDeviceFrame::AddInfinityRow(wxString name, uint8 rowNumbe
 	m_infinitySlots[rowNumber] =
 		new wxTextCtrl(box, wxID_ANY, _("None"), wxDefaultPosition, wxDefaultSize,
 					   wxTE_READONLY);
-	m_infinitySlots[rowNumber]->SetMinSize(wxSize(150, -1));
 	m_infinitySlots[rowNumber]->Disable();
 	row->Add(m_infinitySlots[rowNumber], 1, wxALL | wxEXPAND, 5);
 	auto* loadButton = new wxButton(box, wxID_ANY, _("Load"));
diff --git a/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.h b/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.h
index 78c70a4a..f19620a2 100644
--- a/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.h
+++ b/src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.h
@@ -25,6 +25,7 @@ class EmulatedUSBDeviceFrame : public wxFrame
 	std::array<std::optional<uint32>, 7> GetCurrentMinifigs();
 
   private:
+	wxNotebook* m_notebook = nullptr;
 	wxCheckBox* m_emulatePortal;
 	wxCheckBox* m_emulateBase;
 	wxCheckBox* m_emulateToypad;
@@ -40,6 +41,7 @@ class EmulatedUSBDeviceFrame : public wxFrame
 	wxBoxSizer* AddSkylanderRow(uint8 row_number, wxStaticBox* box);
 	wxBoxSizer* AddInfinityRow(wxString name, uint8 row_number, wxStaticBox* box);
 	wxBoxSizer* AddDimensionPanel(uint8 pad, uint8 index, wxStaticBox* box);
+	void UpdateWindowSizeForCurrentPage();
 	void LoadSkylander(uint8 slot);
 	void LoadSkylanderPath(uint8 slot, wxString path);
 	void CreateSkylander(uint8 slot);
@@ -99,4 +101,4 @@ class MoveDimensionFigureDialog : public wxDialog
 
   private:
 	wxBoxSizer* AddMinifigSlot(uint8 pad, uint8 index, uint8 oldIndex, std::optional<uint32> currentId);
-};
\ No newline at end of file
+};