From df7c9664da6fb89b23fc7d1ad90d35d3f9bc4b78 Mon Sep 17 00:00:00 2001 From: Simon McFarlane Date: Mon, 27 Apr 2015 22:33:11 -0700 Subject: [PATCH 1/2] Set minimum size on config window To prevent tabs from getting a scrollbar --- Source/Core/DolphinWX/Config/ConfigMain.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp index f96b47688d..3f882591a1 100644 --- a/Source/Core/DolphinWX/Config/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp @@ -81,6 +81,8 @@ void CConfigMain::CreateGUIControls() main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5); main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); + main_sizer->SetMinSize(400, 0); + SetSizerAndFit(main_sizer); Center(); SetFocus(); From 8f56138ec45a72ad4ef865f472adc87292d23005 Mon Sep 17 00:00:00 2001 From: Simon McFarlane Date: Mon, 27 Apr 2015 23:07:47 -0700 Subject: [PATCH 2/2] Use wxStaticText::Wrap rather than manually inserting newlines --- .../Core/DolphinWX/Config/AdvancedConfigPane.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index 8dd69d1e3f..4ce88c4c4d 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -29,14 +29,15 @@ void AdvancedConfigPane::InitializeGUI() m_clock_override_slider->Bind(wxEVT_SLIDER, &AdvancedConfigPane::OnClockOverrideSliderChanged, this); wxStaticText* const clock_override_description = new wxStaticText(this, wxID_ANY, - _("Higher values can make variable-framerate games\n" - "run at a higher framerate, at the expense of CPU.\n" - "Lower values can make variable-framerate games\n" + _("Higher values can make variable-framerate games " + "run at a higher framerate, at the expense of CPU. " + "Lower values can make variable-framerate games " "run at a lower framerate, saving CPU.\n\n" - "WARNING: Changing this from the default (100%)\n" - "can and will break games and cause glitches.\n" - "Do so at your own risk. Please do not report\n" - "bugs that occur with a non-default clock.\n")); + "WARNING: Changing this from the default (100%) " + "can and will break games and cause glitches. " + "Do so at your own risk. Please do not report " + "bugs that occur with a non-default clock. ")); + clock_override_description->Wrap(400); wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL); clock_override_checkbox_sizer->Add(m_clock_override_checkbox);