From f5d0542f06ea8c583cd3b07564521fbdda8d82b3 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Sat, 6 Nov 2021 21:26:58 -0500 Subject: [PATCH] DEV9-GUI: Rearrange config interface Fixes HDD Size ticks from 1 to 10 (40,50,60,...) and less squished together. --- pcsx2/DEV9/ConfigUI.cpp | 44 ++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pcsx2/DEV9/ConfigUI.cpp b/pcsx2/DEV9/ConfigUI.cpp index 0cd60fd2cb..45bd86ec08 100644 --- a/pcsx2/DEV9/ConfigUI.cpp +++ b/pcsx2/DEV9/ConfigUI.cpp @@ -120,14 +120,17 @@ public: auto* padding = new wxBoxSizer(wxVERTICAL); auto* top_box = new wxBoxSizer(wxVERTICAL); + int space = wxSizerFlags().Border().GetBorderInPixels(); + int two_space = wxSizerFlags().DoubleBorder().GetBorderInPixels(); + // Ethernet section auto* eth_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Ethernet")); m_eth_enable = new wxCheckBox(this, wxID_ANY, _("Enabled")); eth_sizer->Add(m_eth_enable); - eth_sizer->AddSpacer(5); + eth_sizer->AddSpacer(space); - auto* eth_adapter_box = new wxGridBagSizer(5, 5); + auto* eth_adapter_box = new wxGridBagSizer(space, space); for (const AdapterEntry& adapter : PCAPAdapter::GetAdapters()) addAdapter(adapter); #ifdef _WIN32 @@ -166,42 +169,44 @@ public: m_dns1_address .create(6, this, eth_adapter_box, _("DNS1 Address:")); m_dns2_address .create(7, this, eth_adapter_box, _("DNS2 Address:")); - eth_adapter_box->AddGrowableCol(1); + eth_adapter_box->AddGrowableCol(2); eth_sizer->Add(eth_adapter_box, wxSizerFlags().Expand()); // HDD section auto* hdd_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Hard Disk Drive")); m_hdd_enable = new wxCheckBox(this, wxID_ANY, _("Enabled")); - hdd_sizer->Add(m_hdd_enable); - hdd_sizer->AddSpacer(5); - auto* hdd_grid = new wxFlexGridSizer(2, 0, 5); - hdd_grid->AddGrowableCol(1); - auto* hdd_file_label = new wxStaticText(this, wxID_ANY, _("HDD File:")); + auto* hdd_file_label = new wxStaticText(this, wxID_ANY, _("HDD File")); m_hdd_file = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, _("HDD image file"), "HDD|*.raw", wxDefaultPosition, wxDefaultSize, wxFLP_SAVE | wxFLP_USE_TEXTCTRL); - hdd_grid->Add(hdd_file_label, wxSizerFlags().Centre().Right()); - hdd_grid->Add(m_hdd_file, wxSizerFlags().Expand()); - auto* hdd_size_label = new wxStaticText(this, wxID_ANY, _("HDD Size (GiB):")); + auto* hdd_size_label = new wxStaticText(this, wxID_ANY, _("HDD Size (GiB)")); auto* hdd_size_box = new wxBoxSizer(wxHORIZONTAL); - m_hdd_size_slider = new wxSlider(this, wxID_ANY, HDD_MIN_GB, HDD_MIN_GB, HDD_MAX_GB, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_MIN_MAX_LABELS | wxSL_AUTOTICKS); + m_hdd_size_slider = new wxSlider(this, wxID_ANY, HDD_MIN_GB, HDD_MIN_GB, HDD_MAX_GB, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL | wxSL_AUTOTICKS); m_hdd_size_slider->SetPageSize(10); - for (int i = 15; i < HDD_MAX_GB; i += 5) - m_hdd_size_slider->SetTick(i); + m_hdd_size_slider->SetTickFreq(10); m_hdd_size_spin = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, HDD_MIN_GB, HDD_MAX_GB, HDD_MIN_GB); m_hdd_size_spin->SetSizeHints(m_hdd_size_spin->GetSizeFromTextSize(30)); hdd_size_box->Add(m_hdd_size_slider, wxSizerFlags(1).Centre()); + hdd_size_box->AddSpacer(space); hdd_size_box->Add(m_hdd_size_spin, wxSizerFlags(0).Centre()); - hdd_grid->Add(hdd_size_label, wxSizerFlags().Centre().Right()); - hdd_grid->Add(hdd_size_box, wxSizerFlags().Expand()); - hdd_sizer->Add(hdd_grid, wxSizerFlags().Expand()); + hdd_sizer->Add(m_hdd_enable); + hdd_sizer->AddSpacer(two_space); + hdd_sizer->Add(hdd_file_label, wxSizerFlags().Left()); + hdd_sizer->AddSpacer(space); + hdd_sizer->Add(m_hdd_file, wxSizerFlags().Expand()); + hdd_sizer->AddSpacer(two_space); + hdd_sizer->Add(hdd_size_label, wxSizerFlags().Left()); + hdd_sizer->AddSpacer(space); + hdd_sizer->Add(hdd_size_box, wxSizerFlags().Expand()); top_box->Add(eth_sizer, wxSizerFlags().Expand()); + top_box->AddSpacer(space); top_box->Add(hdd_sizer, wxSizerFlags().Expand()); + top_box->AddSpacer(space); top_box->Add(CreateStdDialogButtonSizer(wxOK | wxCANCEL), wxSizerFlags().Right()); - padding->Add(top_box, wxSizerFlags().Expand().Border(wxALL, 5)); + padding->Add(top_box, wxSizerFlags().Expand().Border()); SetSizerAndFit(padding); SetMaxSize(wxSize(wxDefaultCoord, GetMinSize().y)); @@ -321,6 +326,9 @@ public: } m_eth_adapter->Set(options); m_eth_adapter->SetSelection(selection); + // Update minimum sizes for the possibly increased dropdown size + // Nothing else seems to update the minimum size of the window + SetSizerAndFit(GetSizer(), false); } void OnCheck(wxCommandEvent&)