From 4655cd01fa2e63f9cfee0cbeb7cd24f49bb1fe9b Mon Sep 17 00:00:00 2001 From: Bartosz Kaszubowski Date: Tue, 8 Dec 2015 02:13:32 +0100 Subject: [PATCH] minor General Config GUI improvements - theme and language selectors wrapped into one GridBagSizer for better appearance - missing left padding added to checkbox on Advanced Pane --- .../DolphinWX/Config/AdvancedConfigPane.cpp | 2 +- .../DolphinWX/Config/InterfaceConfigPane.cpp | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index a10e5985ad20..c18ad133001f 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -40,7 +40,7 @@ void AdvancedConfigPane::InitializeGUI() clock_override_description->Wrap(400); wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL); - clock_override_checkbox_sizer->Add(m_clock_override_checkbox); + clock_override_checkbox_sizer->Add(m_clock_override_checkbox, 1, wxALL, 5); wxBoxSizer* const clock_override_slider_sizer = new wxBoxSizer(wxHORIZONTAL); clock_override_slider_sizer->Add(m_clock_override_slider, 1, wxALL, 5); diff --git a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp index 226ea1d191a5..4cdcda7478ef 100644 --- a/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/InterfaceConfigPane.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -116,22 +117,18 @@ void InterfaceConfigPane::InitializeGUI() m_pause_focus_lost_checkbox->SetToolTip(_("Pauses the emulator when focus is taken away from the emulation window.")); m_interface_lang_choice->SetToolTip(_("Change the language of the user interface.\nRequires restart.")); - wxBoxSizer* const language_sizer = new wxBoxSizer(wxHORIZONTAL); - language_sizer->Add(new wxStaticText(this, wxID_ANY, _("Language:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - language_sizer->Add(m_interface_lang_choice, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - - wxBoxSizer* const theme_sizer = new wxBoxSizer(wxHORIZONTAL); - theme_sizer->Add(new wxStaticText(this, wxID_ANY, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - theme_sizer->Add(m_theme_choice, 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); - theme_sizer->AddStretchSpacer(); + wxGridBagSizer* const language_and_theme_grid_sizer = new wxGridBagSizer(); + language_and_theme_grid_sizer->Add(new wxStaticText(this, wxID_ANY, _("Language:")), wxGBPosition(0, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxALL, 5); + language_and_theme_grid_sizer->Add(m_interface_lang_choice, wxGBPosition(0, 1), wxDefaultSpan, wxALL, 5); + 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); 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(theme_sizer, 0, wxEXPAND | wxALL, 5); - main_static_box_sizer->Add(language_sizer, 0, wxEXPAND | wxALL, 5); + main_static_box_sizer->Add(language_and_theme_grid_sizer, 0, wxEXPAND | wxALL, 0); wxBoxSizer* const main_box_sizer = new wxBoxSizer(wxVERTICAL); main_box_sizer->Add(main_static_box_sizer, 0, wxEXPAND | wxALL, 5);