diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index c245a358cb..406e76785f 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -7,9 +7,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -17,6 +15,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "DolphinWX/Config/AdvancedConfigPane.h" +#include "DolphinWX/DolphinSlider.h" AdvancedConfigPane::AdvancedConfigPane(wxWindow* parent, wxWindowID id) : wxPanel(parent, id) { @@ -29,7 +28,7 @@ void AdvancedConfigPane::InitializeGUI() { m_clock_override_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable CPU Clock Override")); m_clock_override_slider = - new wxSlider(this, wxID_ANY, 100, 0, 150, wxDefaultPosition, wxSize(200, -1)); + new DolphinSlider(this, wxID_ANY, 100, 0, 150, wxDefaultPosition, FromDIP(wxSize(200, -1))); m_clock_override_text = new wxStaticText(this, wxID_ANY, ""); m_clock_override_checkbox->Bind(wxEVT_CHECKBOX, @@ -67,47 +66,47 @@ void AdvancedConfigPane::InitializeGUI() clock_override_description->Wrap(550); custom_rtc_description->Wrap(550); #else - clock_override_description->Wrap(400); - custom_rtc_description->Wrap(400); + clock_override_description->Wrap(FromDIP(400)); + custom_rtc_description->Wrap(FromDIP(400)); #endif - wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL); - clock_override_checkbox_sizer->Add(m_clock_override_checkbox, 1, wxALL, 5); + const int space5 = FromDIP(5); wxBoxSizer* const clock_override_slider_sizer = new wxBoxSizer(wxHORIZONTAL); - clock_override_slider_sizer->Add(m_clock_override_slider, 1, wxALL, 5); - clock_override_slider_sizer->Add(m_clock_override_text, 1, wxALL, 5); - - wxBoxSizer* const clock_override_description_sizer = new wxBoxSizer(wxHORIZONTAL); - clock_override_description_sizer->Add(clock_override_description, 1, wxALL, 5); + clock_override_slider_sizer->Add(m_clock_override_slider, 1); + clock_override_slider_sizer->Add(m_clock_override_text, 1, wxLEFT, space5); wxStaticBoxSizer* const cpu_options_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("CPU Options")); - cpu_options_sizer->Add(clock_override_checkbox_sizer); - cpu_options_sizer->Add(clock_override_slider_sizer); - cpu_options_sizer->Add(clock_override_description_sizer); + cpu_options_sizer->AddSpacer(space5); + cpu_options_sizer->Add(m_clock_override_checkbox, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + cpu_options_sizer->AddSpacer(space5); + cpu_options_sizer->Add(clock_override_slider_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + cpu_options_sizer->AddSpacer(space5); + cpu_options_sizer->Add(clock_override_description, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + cpu_options_sizer->AddSpacer(space5); - wxBoxSizer* const custom_rtc_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL); - custom_rtc_checkbox_sizer->Add(m_custom_rtc_checkbox, 1, wxALL, 5); - - wxGridBagSizer* const custom_rtc_date_time_sizer = new wxGridBagSizer(); - custom_rtc_date_time_sizer->Add(m_custom_rtc_date_picker, wxGBPosition(0, 0), wxDefaultSpan, - wxEXPAND | wxALL, 5); - custom_rtc_date_time_sizer->Add(m_custom_rtc_time_picker, wxGBPosition(0, 1), wxDefaultSpan, - wxEXPAND | wxALL, 5); - - wxBoxSizer* const custom_rtc_description_sizer = new wxBoxSizer(wxHORIZONTAL); - custom_rtc_description_sizer->Add(custom_rtc_description, 1, wxALL, 5); + wxFlexGridSizer* const custom_rtc_date_time_sizer = + new wxFlexGridSizer(2, wxSize(space5, space5)); + custom_rtc_date_time_sizer->Add(m_custom_rtc_date_picker, 0, wxEXPAND); + custom_rtc_date_time_sizer->Add(m_custom_rtc_time_picker, 0, wxEXPAND); wxStaticBoxSizer* const custom_rtc_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Custom RTC Options")); - custom_rtc_sizer->Add(custom_rtc_checkbox_sizer); - custom_rtc_sizer->Add(custom_rtc_date_time_sizer); - custom_rtc_sizer->Add(custom_rtc_description_sizer); + custom_rtc_sizer->AddSpacer(space5); + custom_rtc_sizer->Add(m_custom_rtc_checkbox, 0, wxLEFT | wxRIGHT, space5); + custom_rtc_sizer->AddSpacer(space5); + custom_rtc_sizer->Add(custom_rtc_date_time_sizer, 0, wxLEFT | wxRIGHT, space5); + custom_rtc_sizer->AddSpacer(space5); + custom_rtc_sizer->Add(custom_rtc_description, 0, wxLEFT | wxRIGHT, space5); + custom_rtc_sizer->AddSpacer(space5); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(cpu_options_sizer, 0, wxEXPAND | wxALL, 5); - main_sizer->Add(custom_rtc_sizer, 0, wxEXPAND | wxALL, 5); + main_sizer->AddSpacer(space5); + main_sizer->Add(cpu_options_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(custom_rtc_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); SetSizer(main_sizer); } diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.h b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h index 64296ef2f3..4b19e35c55 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.h +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.h @@ -6,9 +6,9 @@ #include +class DolphinSlider; class wxCheckBox; class wxDatePickerCtrl; -class wxSlider; class wxStaticText; class wxTimePickerCtrl; @@ -37,7 +37,7 @@ private: u32 m_temp_time; wxCheckBox* m_clock_override_checkbox; - wxSlider* m_clock_override_slider; + DolphinSlider* m_clock_override_slider; wxStaticText* m_clock_override_text; wxCheckBox* m_custom_rtc_checkbox; wxDatePickerCtrl* m_custom_rtc_date_picker; diff --git a/Source/Core/DolphinWX/Config/AudioConfigPane.cpp b/Source/Core/DolphinWX/Config/AudioConfigPane.cpp index 97dc4ca145..f1125700fc 100644 --- a/Source/Core/DolphinWX/Config/AudioConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AudioConfigPane.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include @@ -18,6 +17,7 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" #include "DolphinWX/Config/AudioConfigPane.h" +#include "DolphinWX/DolphinSlider.h" #include "DolphinWX/WxUtils.h" AudioConfigPane::AudioConfigPane(wxWindow* parent, wxWindowID id) : wxPanel(parent, id) @@ -37,8 +37,8 @@ void AudioConfigPane::InitializeGUI() new wxRadioBox(this, wxID_ANY, _("DSP Emulator Engine"), wxDefaultPosition, wxDefaultSize, m_dsp_engine_strings, 0, wxRA_SPECIFY_ROWS); m_dpl2_decoder_checkbox = new wxCheckBox(this, wxID_ANY, _("Dolby Pro Logic II decoder")); - m_volume_slider = new wxSlider(this, wxID_ANY, 0, 0, 100, wxDefaultPosition, wxDefaultSize, - wxSL_VERTICAL | wxSL_INVERSE); + m_volume_slider = new DolphinSlider(this, wxID_ANY, 0, 0, 100, wxDefaultPosition, wxDefaultSize, + wxSL_VERTICAL | wxSL_INVERSE); m_volume_text = new wxStaticText(this, wxID_ANY, ""); m_audio_backend_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_audio_backend_strings); @@ -64,34 +64,51 @@ void AudioConfigPane::InitializeGUI() _("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL or Pulse backends only.")); #endif + const int space5 = FromDIP(5); + wxStaticBoxSizer* const dsp_engine_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Sound Settings")); - dsp_engine_sizer->Add(m_dsp_engine_radiobox, 0, wxALL | wxEXPAND, 5); - dsp_engine_sizer->Add(m_dpl2_decoder_checkbox, 0, wxALL, 5); + dsp_engine_sizer->Add(m_dsp_engine_radiobox, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + dsp_engine_sizer->AddSpacer(space5); + dsp_engine_sizer->AddStretchSpacer(); + dsp_engine_sizer->Add(m_dpl2_decoder_checkbox, 0, wxLEFT | wxRIGHT, space5); + dsp_engine_sizer->AddStretchSpacer(); + dsp_engine_sizer->AddSpacer(space5); wxStaticBoxSizer* const volume_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Volume")); - volume_sizer->Add(m_volume_slider, 1, wxLEFT | wxRIGHT, 13); - volume_sizer->Add(m_volume_text, 0, wxALIGN_CENTER | wxALL, 5); + volume_sizer->Add(m_volume_slider, 1, wxALIGN_CENTER_HORIZONTAL); + volume_sizer->Add(m_volume_text, 0, wxALIGN_CENTER_HORIZONTAL | wxLEFT | wxRIGHT, space5); + volume_sizer->AddSpacer(space5); - wxGridBagSizer* const backend_grid_sizer = new wxGridBagSizer(); + wxGridBagSizer* const backend_grid_sizer = new wxGridBagSizer(space5, space5); backend_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Audio Backend:")), wxGBPosition(0, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - backend_grid_sizer->Add(m_audio_backend_choice, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + backend_grid_sizer->Add(m_audio_backend_choice, wxGBPosition(0, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); backend_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Latency:")), wxGBPosition(1, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - backend_grid_sizer->Add(m_audio_latency_spinctrl, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + backend_grid_sizer->Add(m_audio_latency_spinctrl, wxGBPosition(1, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); wxStaticBoxSizer* const backend_static_box_sizer = - new wxStaticBoxSizer(wxHORIZONTAL, this, _("Backend Settings")); - backend_static_box_sizer->Add(backend_grid_sizer, 0, wxEXPAND); + new wxStaticBoxSizer(wxVERTICAL, this, _("Backend Settings")); + backend_static_box_sizer->AddSpacer(space5); + backend_static_box_sizer->Add(backend_grid_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + backend_static_box_sizer->AddSpacer(space5); wxBoxSizer* const dsp_audio_sizer = new wxBoxSizer(wxHORIZONTAL); - dsp_audio_sizer->Add(dsp_engine_sizer, 1, wxEXPAND | wxALL, 5); - dsp_audio_sizer->Add(volume_sizer, 0, wxEXPAND | wxALL, 5); + dsp_audio_sizer->AddSpacer(space5); + dsp_audio_sizer->Add(dsp_engine_sizer, 1, wxEXPAND | wxTOP | wxBOTTOM, space5); + dsp_audio_sizer->AddSpacer(space5); + dsp_audio_sizer->Add(volume_sizer, 0, wxEXPAND | wxTOP | wxBOTTOM, space5); + dsp_audio_sizer->AddSpacer(space5); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(dsp_audio_sizer, 0, wxALL | wxEXPAND); - main_sizer->Add(backend_static_box_sizer, 0, wxALL | wxEXPAND, 5); + main_sizer->AddSpacer(space5); + main_sizer->Add(dsp_audio_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(backend_static_box_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); SetSizerAndFit(main_sizer); } @@ -180,10 +197,10 @@ void AudioConfigPane::PopulateBackendChoiceBox() for (const std::string& backend : AudioCommon::GetSoundBackends()) { m_audio_backend_choice->Append(wxGetTranslation(StrToWxStr(backend))); - - int num = m_audio_backend_choice->FindString(StrToWxStr(SConfig::GetInstance().sBackend)); - m_audio_backend_choice->SetSelection(num); } + + int num = m_audio_backend_choice->FindString(StrToWxStr(SConfig::GetInstance().sBackend)); + m_audio_backend_choice->SetSelection(num); } bool AudioConfigPane::SupportsVolumeChanges(const std::string& backend) diff --git a/Source/Core/DolphinWX/Config/AudioConfigPane.h b/Source/Core/DolphinWX/Config/AudioConfigPane.h index b2a988371c..877be31da5 100644 --- a/Source/Core/DolphinWX/Config/AudioConfigPane.h +++ b/Source/Core/DolphinWX/Config/AudioConfigPane.h @@ -8,10 +8,10 @@ #include #include +class DolphinSlider; class wxCheckBox; class wxChoice; class wxRadioBox; -class wxSlider; class wxSpinCtrl; class wxStaticText; @@ -39,7 +39,7 @@ private: wxRadioBox* m_dsp_engine_radiobox; wxCheckBox* m_dpl2_decoder_checkbox; - wxSlider* m_volume_slider; + DolphinSlider* m_volume_slider; wxStaticText* m_volume_text; wxChoice* m_audio_backend_choice; wxSpinCtrl* m_audio_latency_spinctrl; diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp index b41e0c9ed7..1836167ede 100644 --- a/Source/Core/DolphinWX/Config/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp @@ -76,16 +76,23 @@ void CConfigMain::CreateGUIControls() Notebook->AddPage(path_pane, _("Paths")); Notebook->AddPage(advanced_pane, _("Advanced")); + const int space5 = FromDIP(5); + wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5); - main_sizer->Add(CreateButtonSizer(wxCLOSE), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); + main_sizer->AddSpacer(space5); + main_sizer->Add(Notebook, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(CreateButtonSizer(wxCLOSE), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); #ifdef __APPLE__ main_sizer->SetMinSize(550, 0); #else - main_sizer->SetMinSize(400, 0); + main_sizer->SetMinSize(FromDIP(400), 0); #endif + SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED); + SetLayoutAdaptationLevel(wxDIALOG_ADAPTATION_STANDARD_SIZER); SetSizerAndFit(main_sizer); Center(); SetFocus(); diff --git a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp index bd66b56705..06892a26bb 100644 --- a/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GameCubeConfigPane.cpp @@ -100,42 +100,51 @@ void GameCubeConfigPane::InitializeGUI() new wxButton(this, wxID_ANY, "...", wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT); m_memcard_path[1]->Bind(wxEVT_BUTTON, &GameCubeConfigPane::OnSlotBButtonClick, this); + const int space5 = FromDIP(5); + const int space10 = FromDIP(10); + // Populate the GameCube page - wxGridBagSizer* const sGamecubeIPLSettings = new wxGridBagSizer(); - sGamecubeIPLSettings->Add(m_skip_bios_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, 5); + wxGridBagSizer* const sGamecubeIPLSettings = new wxGridBagSizer(space5, space5); + sGamecubeIPLSettings->Add(m_skip_bios_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2)); sGamecubeIPLSettings->Add(new wxStaticText(this, wxID_ANY, _("System Language:")), - wxGBPosition(1, 0), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5); + wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); sGamecubeIPLSettings->Add(m_system_lang_choice, wxGBPosition(1, 1), wxDefaultSpan, - wxLEFT | wxRIGHT | wxBOTTOM, 5); - sGamecubeIPLSettings->Add(m_override_lang_checkbox, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5); + wxALIGN_CENTER_VERTICAL); + sGamecubeIPLSettings->Add(m_override_lang_checkbox, wxGBPosition(2, 0), wxGBSpan(1, 2)); wxStaticBoxSizer* const sbGamecubeIPLSettings = new wxStaticBoxSizer(wxVERTICAL, this, _("IPL Settings")); - sbGamecubeIPLSettings->Add(sGamecubeIPLSettings); + sbGamecubeIPLSettings->AddSpacer(space5); + sbGamecubeIPLSettings->Add(sGamecubeIPLSettings, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + sbGamecubeIPLSettings->AddSpacer(space5); + wxStaticBoxSizer* const sbGamecubeDeviceSettings = new wxStaticBoxSizer(wxVERTICAL, this, _("Device Settings")); - wxGridBagSizer* const sbGamecubeEXIDevSettings = new wxGridBagSizer(10, 10); - + wxGridBagSizer* const gamecube_EXIDev_sizer = new wxGridBagSizer(space10, space10); for (int i = 0; i < 3; ++i) { - sbGamecubeEXIDevSettings->Add(GCEXIDeviceText[i], wxGBPosition(i, 0), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL); - sbGamecubeEXIDevSettings->Add(m_exi_devices[i], wxGBPosition(i, 1), - wxGBSpan(1, (i < 2) ? 1 : 2), wxALIGN_CENTER_VERTICAL); + gamecube_EXIDev_sizer->Add(GCEXIDeviceText[i], wxGBPosition(i, 0), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); + gamecube_EXIDev_sizer->Add(m_exi_devices[i], wxGBPosition(i, 1), wxGBSpan(1, (i < 2) ? 1 : 2), + wxALIGN_CENTER_VERTICAL); if (i < 2) - sbGamecubeEXIDevSettings->Add(m_memcard_path[i], wxGBPosition(i, 2), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL); + gamecube_EXIDev_sizer->Add(m_memcard_path[i], wxGBPosition(i, 2), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); if (NetPlay::IsNetPlayRunning()) m_exi_devices[i]->Disable(); } - sbGamecubeDeviceSettings->Add(sbGamecubeEXIDevSettings, 0, wxALL, 5); + sbGamecubeDeviceSettings->AddSpacer(space5); + sbGamecubeDeviceSettings->Add(gamecube_EXIDev_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + sbGamecubeDeviceSettings->AddSpacer(space5); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(sbGamecubeIPLSettings, 0, wxEXPAND | wxALL, 5); - main_sizer->Add(sbGamecubeDeviceSettings, 0, wxEXPAND | wxALL, 5); + main_sizer->AddSpacer(space5); + main_sizer->Add(sbGamecubeIPLSettings, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(sbGamecubeDeviceSettings, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); SetSizer(main_sizer); } diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp index 454fb3a59f..e5f81f7736 100644 --- a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp @@ -101,32 +101,51 @@ void GeneralConfigPane::InitializeGUI() m_throttler_choice->Bind(wxEVT_CHOICE, &GeneralConfigPane::OnThrottlerChoiceChanged, this); m_cpu_engine_radiobox->Bind(wxEVT_RADIOBOX, &GeneralConfigPane::OnCPUEngineRadioBoxChanged, this); + const int space5 = FromDIP(5); + wxBoxSizer* const throttler_sizer = new wxBoxSizer(wxHORIZONTAL); + throttler_sizer->AddSpacer(space5); throttler_sizer->Add(new wxStaticText(this, wxID_ANY, _("Speed Limit:")), 0, - wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, 5); - throttler_sizer->Add(m_throttler_choice, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5); + wxALIGN_CENTER_VERTICAL | wxBOTTOM, space5); + throttler_sizer->AddSpacer(space5); + throttler_sizer->Add(m_throttler_choice, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, space5); + throttler_sizer->AddSpacer(space5); wxStaticBoxSizer* const basic_settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Basic Settings")); - basic_settings_sizer->Add(m_dual_core_checkbox, 0, wxALL, 5); - basic_settings_sizer->Add(m_idle_skip_checkbox, 0, wxALL, 5); - basic_settings_sizer->Add(m_cheats_checkbox, 0, wxALL, 5); + basic_settings_sizer->AddSpacer(space5); + basic_settings_sizer->Add(m_dual_core_checkbox, 0, wxLEFT | wxRIGHT, space5); + basic_settings_sizer->AddSpacer(space5); + basic_settings_sizer->Add(m_idle_skip_checkbox, 0, wxLEFT | wxRIGHT, space5); + basic_settings_sizer->AddSpacer(space5); + basic_settings_sizer->Add(m_cheats_checkbox, 0, wxLEFT | wxRIGHT, space5); + basic_settings_sizer->AddSpacer(space5); basic_settings_sizer->Add(throttler_sizer); wxStaticBoxSizer* const analytics_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Usage Statistics Reporting Settings")); - analytics_sizer->Add(m_analytics_checkbox, 0, wxALL, 5); - analytics_sizer->Add(m_analytics_new_id, 0, wxALL, 5); + analytics_sizer->AddSpacer(space5); + analytics_sizer->Add(m_analytics_checkbox, 0, wxLEFT | wxRIGHT, space5); + analytics_sizer->AddSpacer(space5); + analytics_sizer->Add(m_analytics_new_id, 0, wxLEFT | wxRIGHT, space5); + analytics_sizer->AddSpacer(space5); wxStaticBoxSizer* const advanced_settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Advanced Settings")); - advanced_settings_sizer->Add(m_cpu_engine_radiobox, 0, wxALL, 5); - advanced_settings_sizer->Add(m_force_ntscj_checkbox, 0, wxALL, 5); + advanced_settings_sizer->AddSpacer(space5); + advanced_settings_sizer->Add(m_cpu_engine_radiobox, 0, wxLEFT | wxRIGHT, space5); + advanced_settings_sizer->AddSpacer(space5); + advanced_settings_sizer->Add(m_force_ntscj_checkbox, 0, wxLEFT | wxRIGHT, space5); + advanced_settings_sizer->AddSpacer(space5); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(basic_settings_sizer, 0, wxEXPAND | wxALL, 5); - main_sizer->Add(analytics_sizer, 0, wxEXPAND | wxALL, 5); - main_sizer->Add(advanced_settings_sizer, 0, wxEXPAND | wxALL, 5); + main_sizer->AddSpacer(space5); + main_sizer->Add(basic_settings_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(analytics_sizer, 0, wxEXPAND | wxLEFT | wxLEFT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(advanced_settings_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); SetSizer(main_sizer); } diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp index 988230612f..2927114e58 100644 --- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -30,7 +31,7 @@ #include "DolphinWX/X11Utils.h" #endif -static const std::array language_ids = {{ +static const std::array language_ids{{ "", "ms", "ca", "cs", "da", "de", "en", "es", "fr", "hr", "it", "hu", "nl", @@ -115,27 +116,36 @@ void InterfaceConfigPane::InitializeGUI() m_interface_lang_choice->SetToolTip( _("Change the language of the user interface.\nRequires restart.")); - wxGridBagSizer* const language_and_theme_grid_sizer = new wxGridBagSizer(); + const int space5 = FromDIP(5); + + wxGridBagSizer* const language_and_theme_grid_sizer = new wxGridBagSizer(space5, space5); language_and_theme_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Language:")), - wxGBPosition(0, 0), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL | wxALL, 5); + wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); language_and_theme_grid_sizer->Add(m_interface_lang_choice, wxGBPosition(0, 1), wxDefaultSpan, - wxALL, 5); + wxALIGN_CENTER_VERTICAL); language_and_theme_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Theme:")), - wxGBPosition(1, 0), wxDefaultSpan, - wxALIGN_CENTER_VERTICAL | wxALL, 5); - language_and_theme_grid_sizer->Add(m_theme_choice, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); + wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + language_and_theme_grid_sizer->Add(m_theme_choice, wxGBPosition(1, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); wxStaticBoxSizer* const main_static_box_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Interface Settings")); - main_static_box_sizer->Add(m_confirm_stop_checkbox, 0, wxALL, 5); - main_static_box_sizer->Add(m_panic_handlers_checkbox, 0, wxALL, 5); - main_static_box_sizer->Add(m_osd_messages_checkbox, 0, wxALL, 5); - main_static_box_sizer->Add(m_pause_focus_lost_checkbox, 0, wxALL, 5); - main_static_box_sizer->Add(language_and_theme_grid_sizer, 0, wxEXPAND | wxALL, 0); + main_static_box_sizer->AddSpacer(space5); + main_static_box_sizer->Add(m_confirm_stop_checkbox, 0, wxLEFT | wxRIGHT, space5); + main_static_box_sizer->AddSpacer(space5); + main_static_box_sizer->Add(m_panic_handlers_checkbox, 0, wxLEFT | wxRIGHT, space5); + main_static_box_sizer->AddSpacer(space5); + main_static_box_sizer->Add(m_osd_messages_checkbox, 0, wxLEFT | wxRIGHT, space5); + main_static_box_sizer->AddSpacer(space5); + main_static_box_sizer->Add(m_pause_focus_lost_checkbox, 0, wxLEFT | wxRIGHT, space5); + main_static_box_sizer->AddSpacer(space5); + main_static_box_sizer->Add(language_and_theme_grid_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_static_box_sizer->AddSpacer(space5); wxBoxSizer* const main_box_sizer = new wxBoxSizer(wxVERTICAL); - main_box_sizer->Add(main_static_box_sizer, 0, wxEXPAND | wxALL, 5); + main_box_sizer->AddSpacer(space5); + main_box_sizer->Add(main_static_box_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_box_sizer->AddSpacer(space5); SetSizer(main_box_sizer); } @@ -212,7 +222,10 @@ void InterfaceConfigPane::OnInterfaceLanguageChoiceChanged(wxCommandEvent& event { if (SConfig::GetInstance().m_InterfaceLanguage != language_ids[m_interface_lang_choice->GetSelection()]) - SuccessAlertT("You must restart Dolphin in order for the change to take effect."); + { + wxMessageBox(_("You must restart Dolphin in order for the change to take effect."), + _("Restart Required"), wxOK | wxICON_INFORMATION, this); + } SConfig::GetInstance().m_InterfaceLanguage = language_ids[m_interface_lang_choice->GetSelection()]; diff --git a/Source/Core/DolphinWX/Config/PathConfigPane.cpp b/Source/Core/DolphinWX/Config/PathConfigPane.cpp index 896073bb9a..08664dee29 100644 --- a/Source/Core/DolphinWX/Config/PathConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/PathConfigPane.cpp @@ -77,45 +77,49 @@ void PathConfigPane::InitializeGUI() m_wii_sdcard_filepicker->Bind(wxEVT_FILEPICKER_CHANGED, &PathConfigPane::OnSdCardPathChanged, this); + const int space5 = FromDIP(5); + wxBoxSizer* const iso_button_sizer = new wxBoxSizer(wxHORIZONTAL); - iso_button_sizer->Add(m_recursive_iso_paths_checkbox, 0, wxALL | wxALIGN_CENTER); + iso_button_sizer->Add(m_recursive_iso_paths_checkbox, 0, wxALIGN_CENTER_VERTICAL); iso_button_sizer->AddStretchSpacer(); - iso_button_sizer->Add(m_add_iso_path_button, 0, wxALL); - iso_button_sizer->Add(m_remove_iso_path_button, 0, wxALL); + iso_button_sizer->Add(m_add_iso_path_button, 0, wxALIGN_CENTER_VERTICAL); + iso_button_sizer->Add(m_remove_iso_path_button, 0, wxALIGN_CENTER_VERTICAL); wxStaticBoxSizer* const iso_listbox_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("ISO Directories")); - iso_listbox_sizer->Add(m_iso_paths_listbox, 1, wxEXPAND | wxALL, 0); - iso_listbox_sizer->Add(iso_button_sizer, 0, wxEXPAND | wxALL, 5); + iso_listbox_sizer->Add(m_iso_paths_listbox, 1, wxEXPAND); + iso_listbox_sizer->AddSpacer(space5); + iso_listbox_sizer->Add(iso_button_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + iso_listbox_sizer->AddSpacer(space5); - wxGridBagSizer* const picker_sizer = new wxGridBagSizer(); + wxGridBagSizer* const picker_sizer = new wxGridBagSizer(space5, space5); picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Default ISO:")), wxGBPosition(0, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - picker_sizer->Add(m_default_iso_filepicker, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND | wxALL, - 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + picker_sizer->Add(m_default_iso_filepicker, wxGBPosition(0, 1), wxDefaultSpan, wxEXPAND); picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("DVD Root:")), wxGBPosition(1, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - picker_sizer->Add(m_dvd_root_dirpicker, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND | wxALL, 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + picker_sizer->Add(m_dvd_root_dirpicker, wxGBPosition(1, 1), wxDefaultSpan, wxEXPAND); picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Apploader:")), wxGBPosition(2, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - picker_sizer->Add(m_apploader_path_filepicker, wxGBPosition(2, 1), wxDefaultSpan, - wxEXPAND | wxALL, 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + picker_sizer->Add(m_apploader_path_filepicker, wxGBPosition(2, 1), wxDefaultSpan, wxEXPAND); picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Wii NAND Root:")), wxGBPosition(3, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - picker_sizer->Add(m_nand_root_dirpicker, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND | wxALL, 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + picker_sizer->Add(m_nand_root_dirpicker, wxGBPosition(3, 1), wxDefaultSpan, wxEXPAND); picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("Dump Path:")), wxGBPosition(4, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - picker_sizer->Add(m_dump_path_dirpicker, wxGBPosition(4, 1), wxDefaultSpan, wxEXPAND | wxALL, 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + picker_sizer->Add(m_dump_path_dirpicker, wxGBPosition(4, 1), wxDefaultSpan, wxEXPAND); picker_sizer->Add(new wxStaticText(this, wxID_ANY, _("SD Card Path:")), wxGBPosition(5, 0), - wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); - picker_sizer->Add(m_wii_sdcard_filepicker, wxGBPosition(5, 1), wxDefaultSpan, wxEXPAND | wxALL, - 5); + wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + picker_sizer->Add(m_wii_sdcard_filepicker, wxGBPosition(5, 1), wxDefaultSpan, wxEXPAND); picker_sizer->AddGrowableCol(1); // Populate the Paths page wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(iso_listbox_sizer, 1, wxEXPAND | wxALL, 5); - main_sizer->Add(picker_sizer, 0, wxEXPAND | wxALL, 5); + main_sizer->AddSpacer(space5); + main_sizer->Add(iso_listbox_sizer, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(picker_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); SetSizer(main_sizer); } diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.cpp b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp index 559bee6051..c53b5757d2 100644 --- a/Source/Core/DolphinWX/Config/WiiConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/WiiConfigPane.cpp @@ -14,6 +14,7 @@ #include "Core/IPC_HLE/WII_IPC_HLE.h" #include "DiscIO/Enums.h" #include "DolphinWX/Config/WiiConfigPane.h" +#include "DolphinWX/DolphinSlider.h" #include "DolphinWX/WxUtils.h" WiiConfigPane::WiiConfigPane(wxWindow* parent, wxWindowID id) : wxPanel(parent, id) @@ -52,14 +53,10 @@ void WiiConfigPane::InitializeGUI() m_connect_keyboard_checkbox = new wxCheckBox(this, wxID_ANY, _("Connect USB Keyboard")); m_bt_sensor_bar_pos = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_bt_sensor_bar_pos_strings); - m_bt_sensor_bar_sens = new wxSlider(this, wxID_ANY, 0, 0, 4); - m_bt_speaker_volume = new wxSlider(this, wxID_ANY, 0, 0, 127); + m_bt_sensor_bar_sens = new DolphinSlider(this, wxID_ANY, 0, 0, 4); + m_bt_speaker_volume = new DolphinSlider(this, wxID_ANY, 0, 0, 127); m_bt_wiimote_motor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor")); - // With some GTK themes, no minimum size will be applied - so do this manually here - m_bt_sensor_bar_sens->SetMinSize(wxSize(100, -1)); - m_bt_speaker_volume->SetMinSize(wxSize(100, -1)); - m_screensaver_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnScreenSaverCheckBoxChanged, this); m_pal60_mode_checkbox->Bind(wxEVT_CHECKBOX, &WiiConfigPane::OnPAL60CheckBoxChanged, this); m_aspect_ratio_choice->Bind(wxEVT_CHOICE, &WiiConfigPane::OnAspectRatioChoiceChanged, this); @@ -79,67 +76,78 @@ void WiiConfigPane::InitializeGUI() m_sd_card_checkbox->SetToolTip(_("Saved to /Wii/sd.raw (default size is 128mb)")); m_connect_keyboard_checkbox->SetToolTip(_("May cause slow down in Wii Menu and some games.")); - wxGridBagSizer* const misc_settings_grid_sizer = new wxGridBagSizer(); - misc_settings_grid_sizer->Add(m_screensaver_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2), wxALL, - 5); - misc_settings_grid_sizer->Add(m_pal60_mode_checkbox, wxGBPosition(1, 0), wxGBSpan(1, 2), wxALL, - 5); + const int space5 = FromDIP(5); + + wxGridBagSizer* const misc_settings_grid_sizer = new wxGridBagSizer(space5, space5); + misc_settings_grid_sizer->Add(m_screensaver_checkbox, wxGBPosition(0, 0), wxGBSpan(1, 2)); + misc_settings_grid_sizer->Add(m_pal60_mode_checkbox, wxGBPosition(1, 0), wxGBSpan(1, 2)); misc_settings_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Aspect Ratio:")), - wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, - 5); - misc_settings_grid_sizer->Add(m_aspect_ratio_choice, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5); + wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + misc_settings_grid_sizer->Add(m_aspect_ratio_choice, wxGBPosition(2, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); misc_settings_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("System Language:")), - wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, - 5); - misc_settings_grid_sizer->Add(m_system_language_choice, wxGBPosition(3, 1), wxDefaultSpan, wxALL, - 5); + wxGBPosition(3, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + misc_settings_grid_sizer->Add(m_system_language_choice, wxGBPosition(3, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); auto* const bt_sensor_bar_pos_sizer = new wxBoxSizer(wxHORIZONTAL); bt_sensor_bar_pos_sizer->Add(new wxStaticText(this, wxID_ANY, _("Min")), 0, wxALIGN_CENTER_VERTICAL); - bt_sensor_bar_pos_sizer->Add(m_bt_sensor_bar_sens); + bt_sensor_bar_pos_sizer->Add(m_bt_sensor_bar_sens, 0, wxALIGN_CENTER_VERTICAL); bt_sensor_bar_pos_sizer->Add(new wxStaticText(this, wxID_ANY, _("Max")), 0, wxALIGN_CENTER_VERTICAL); auto* const bt_speaker_volume_sizer = new wxBoxSizer(wxHORIZONTAL); bt_speaker_volume_sizer->Add(new wxStaticText(this, wxID_ANY, _("Min")), 0, wxALIGN_CENTER_VERTICAL); - bt_speaker_volume_sizer->Add(m_bt_speaker_volume); + bt_speaker_volume_sizer->Add(m_bt_speaker_volume, 0, wxALIGN_CENTER_VERTICAL); bt_speaker_volume_sizer->Add(new wxStaticText(this, wxID_ANY, _("Max")), 0, wxALIGN_CENTER_VERTICAL); - wxGridBagSizer* const bt_settings_grid_sizer = new wxGridBagSizer(); + wxGridBagSizer* const bt_settings_grid_sizer = new wxGridBagSizer(space5, space5); bt_settings_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Sensor Bar Position:")), - wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, - 5); - bt_settings_grid_sizer->Add(m_bt_sensor_bar_pos, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5); + wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + bt_settings_grid_sizer->Add(m_bt_sensor_bar_pos, wxGBPosition(0, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); bt_settings_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("IR Sensitivity:")), - wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, - 5); - bt_settings_grid_sizer->Add(bt_sensor_bar_pos_sizer, wxGBPosition(1, 1), wxDefaultSpan, wxALL, 5); + wxGBPosition(1, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + bt_settings_grid_sizer->Add(bt_sensor_bar_pos_sizer, wxGBPosition(1, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); bt_settings_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Speaker Volume:")), - wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, - 5); - bt_settings_grid_sizer->Add(bt_speaker_volume_sizer, wxGBPosition(2, 1), wxDefaultSpan, wxALL, 5); - bt_settings_grid_sizer->Add(m_bt_wiimote_motor, wxGBPosition(3, 0), wxGBSpan(1, 2), wxALL, 5); + wxGBPosition(2, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + bt_settings_grid_sizer->Add(bt_speaker_volume_sizer, wxGBPosition(2, 1), wxDefaultSpan, + wxALIGN_CENTER_VERTICAL); + bt_settings_grid_sizer->Add(m_bt_wiimote_motor, wxGBPosition(3, 0), wxGBSpan(1, 2), + wxALIGN_CENTER_VERTICAL); wxStaticBoxSizer* const misc_settings_static_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Misc Settings")); - misc_settings_static_sizer->Add(misc_settings_grid_sizer); + misc_settings_static_sizer->AddSpacer(space5); + misc_settings_static_sizer->Add(misc_settings_grid_sizer, 0, wxLEFT | wxRIGHT, space5); + misc_settings_static_sizer->AddSpacer(space5); wxStaticBoxSizer* const device_settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Device Settings")); - device_settings_sizer->Add(m_sd_card_checkbox, 0, wxALL, 5); - device_settings_sizer->Add(m_connect_keyboard_checkbox, 0, wxALL, 5); + device_settings_sizer->AddSpacer(space5); + device_settings_sizer->Add(m_sd_card_checkbox, 0, wxLEFT | wxRIGHT, space5); + device_settings_sizer->AddSpacer(space5); + device_settings_sizer->Add(m_connect_keyboard_checkbox, 0, wxLEFT | wxRIGHT, space5); + device_settings_sizer->AddSpacer(space5); auto* const bt_settings_static_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Wii Remote Settings")); - bt_settings_static_sizer->Add(bt_settings_grid_sizer); + bt_settings_static_sizer->AddSpacer(space5); + bt_settings_static_sizer->Add(bt_settings_grid_sizer, 0, wxLEFT | wxRIGHT, space5); + bt_settings_static_sizer->AddSpacer(space5); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(misc_settings_static_sizer, 0, wxEXPAND | wxALL, 5); - main_sizer->Add(device_settings_sizer, 0, wxEXPAND | wxALL, 5); - main_sizer->Add(bt_settings_static_sizer, 0, wxEXPAND | wxALL, 5); + main_sizer->AddSpacer(space5); + main_sizer->Add(misc_settings_static_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(device_settings_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); + main_sizer->Add(bt_settings_static_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, space5); + main_sizer->AddSpacer(space5); SetSizer(main_sizer); } diff --git a/Source/Core/DolphinWX/Config/WiiConfigPane.h b/Source/Core/DolphinWX/Config/WiiConfigPane.h index ac482277fd..a185751c24 100644 --- a/Source/Core/DolphinWX/Config/WiiConfigPane.h +++ b/Source/Core/DolphinWX/Config/WiiConfigPane.h @@ -13,6 +13,7 @@ namespace DiscIO enum class Language; } +class DolphinSlider; class wxCheckBox; class wxChoice; class wxSlider; @@ -53,7 +54,7 @@ private: wxChoice* m_aspect_ratio_choice; wxChoice* m_bt_sensor_bar_pos; - wxSlider* m_bt_sensor_bar_sens; - wxSlider* m_bt_speaker_volume; + DolphinSlider* m_bt_sensor_bar_sens; + DolphinSlider* m_bt_speaker_volume; wxCheckBox* m_bt_wiimote_motor; };