dahjah/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2026-06-04 05:35:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge 93c018612d into 7e5516f94d

Browse Source
This commit is contained in:
evairson 2026-04-13 09:46:02 +02:00 committed by GitHub
commit 3440108b61
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.cpp
View File

@ -42,21 +42,55 @@ EmulatedUSBDeviceFrame::EmulatedUSBDeviceFrame(wxWindow* parent)
auto& config = GetConfig(); auto& config = GetConfig();
auto* sizer = new wxBoxSizer(wxVERTICAL); 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")); m_notebook->AddPage(AddSkylanderPage(m_notebook), _("Skylanders Portal"));
notebook->AddPage(AddInfinityPage(notebook), _("Infinity Base")); m_notebook->AddPage(AddInfinityPage(m_notebook), _("Infinity Base"));
notebook->AddPage(AddDimensionsPage(notebook), _("Dimensions Toypad")); 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(); Layout();
Centre(wxBOTH); Centre(wxBOTH);
} }
EmulatedUSBDeviceFrame::~EmulatedUSBDeviceFrame() {} 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) wxPanel* EmulatedUSBDeviceFrame::AddSkylanderPage(wxNotebook* notebook)
{ {
auto* panel = new wxPanel(notebook); auto* panel = new wxPanel(notebook);
@ -177,7 +211,6 @@ wxBoxSizer* EmulatedUSBDeviceFrame::AddSkylanderRow(uint8 rowNumber, wxStaticBox
m_skylanderSlots[rowNumber] = m_skylanderSlots[rowNumber] =
new wxTextCtrl(box, wxID_ANY, _("None"), wxDefaultPosition, wxDefaultSize, new wxTextCtrl(box, wxID_ANY, _("None"), wxDefaultPosition, wxDefaultSize,
wxTE_READONLY); wxTE_READONLY);
m_skylanderSlots[rowNumber]->SetMinSize(wxSize(150, -1));
m_skylanderSlots[rowNumber]->Disable(); m_skylanderSlots[rowNumber]->Disable();
row->Add(m_skylanderSlots[rowNumber], 1, wxEXPAND | wxALL, 2); row->Add(m_skylanderSlots[rowNumber], 1, wxEXPAND | wxALL, 2);
auto* loadButton = new wxButton(box, wxID_ANY, _("Load")); auto* loadButton = new wxButton(box, wxID_ANY, _("Load"));
@ -207,7 +240,6 @@ wxBoxSizer* EmulatedUSBDeviceFrame::AddInfinityRow(wxString name, uint8 rowNumbe
m_infinitySlots[rowNumber] = m_infinitySlots[rowNumber] =
new wxTextCtrl(box, wxID_ANY, _("None"), wxDefaultPosition, wxDefaultSize, new wxTextCtrl(box, wxID_ANY, _("None"), wxDefaultPosition, wxDefaultSize,
wxTE_READONLY); wxTE_READONLY);
m_infinitySlots[rowNumber]->SetMinSize(wxSize(150, -1));
m_infinitySlots[rowNumber]->Disable(); m_infinitySlots[rowNumber]->Disable();
row->Add(m_infinitySlots[rowNumber], 1, wxALL | wxEXPAND, 5); row->Add(m_infinitySlots[rowNumber], 1, wxALL | wxEXPAND, 5);
auto* loadButton = new wxButton(box, wxID_ANY, _("Load")); auto* loadButton = new wxButton(box, wxID_ANY, _("Load"));

4
src/gui/wxgui/EmulatedUSBDevices/EmulatedUSBDeviceFrame.h
View File

@ -25,6 +25,7 @@ class EmulatedUSBDeviceFrame : public wxFrame
std::array<std::optional<uint32>, 7> GetCurrentMinifigs(); std::array<std::optional<uint32>, 7> GetCurrentMinifigs();
private: private:
wxNotebook* m_notebook = nullptr;
wxCheckBox* m_emulatePortal; wxCheckBox* m_emulatePortal;
wxCheckBox* m_emulateBase; wxCheckBox* m_emulateBase;
wxCheckBox* m_emulateToypad; wxCheckBox* m_emulateToypad;
@ -40,6 +41,7 @@ class EmulatedUSBDeviceFrame : public wxFrame
wxBoxSizer* AddSkylanderRow(uint8 row_number, wxStaticBox* box); wxBoxSizer* AddSkylanderRow(uint8 row_number, wxStaticBox* box);
wxBoxSizer* AddInfinityRow(wxString name, uint8 row_number, wxStaticBox* box); wxBoxSizer* AddInfinityRow(wxString name, uint8 row_number, wxStaticBox* box);
wxBoxSizer* AddDimensionPanel(uint8 pad, uint8 index, wxStaticBox* box); wxBoxSizer* AddDimensionPanel(uint8 pad, uint8 index, wxStaticBox* box);
void UpdateWindowSizeForCurrentPage();
void LoadSkylander(uint8 slot); void LoadSkylander(uint8 slot);
void LoadSkylanderPath(uint8 slot, wxString path); void LoadSkylanderPath(uint8 slot, wxString path);
void CreateSkylander(uint8 slot); void CreateSkylander(uint8 slot);
@ -99,4 +101,4 @@ class MoveDimensionFigureDialog : public wxDialog
private: private:
wxBoxSizer* AddMinifigSlot(uint8 pad, uint8 index, uint8 oldIndex, std::optional<uint32> currentId); wxBoxSizer* AddMinifigSlot(uint8 pad, uint8 index, uint8 oldIndex, std::optional<uint32> currentId);
}; };