ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GUI: Fix truncated text on OS X

This commit is contained in:
hthh 2016-06-23 21:26:47 +10:00
parent 49dd4a9f1e
commit 45ad585baf
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp
View File

@ -37,7 +37,12 @@ void AdvancedConfigPane::InitializeGUI()
"can and will break games and cause glitches. " "can and will break games and cause glitches. "
"Do so at your own risk. Please do not report " "Do so at your own risk. Please do not report "
"bugs that occur with a non-default clock. ")); "bugs that occur with a non-default clock. "));
#ifdef __APPLE__
clock_override_description->Wrap(550);
#else
clock_override_description->Wrap(400); clock_override_description->Wrap(400);
#endif
wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL);
clock_override_checkbox_sizer->Add(m_clock_override_checkbox, 1, wxALL, 5); clock_override_checkbox_sizer->Add(m_clock_override_checkbox, 1, wxALL, 5);

4
Source/Core/DolphinWX/Config/ConfigMain.cpp
View File

@ -81,7 +81,11 @@ void CConfigMain::CreateGUIControls()
main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5); main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5);
main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
#ifdef __APPLE__
main_sizer->SetMinSize(550, 0);
#else
main_sizer->SetMinSize(400, 0); main_sizer->SetMinSize(400, 0);
#endif
SetSizerAndFit(main_sizer); SetSizerAndFit(main_sizer);
Center(); Center();

4
Source/Core/DolphinWX/Config/GeneralConfigPane.cpp
View File

@ -59,7 +59,11 @@ void GeneralConfigPane::InitializeGUI()
m_cheats_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable Cheats")); m_cheats_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable Cheats"));
m_force_ntscj_checkbox = new wxCheckBox(this, wxID_ANY, _("Force Console as NTSC-J")); m_force_ntscj_checkbox = new wxCheckBox(this, wxID_ANY, _("Force Console as NTSC-J"));
m_analytics_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable Usage Statistics Reporting")); m_analytics_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable Usage Statistics Reporting"));
#ifdef __APPLE__
m_analytics_new_id = new wxButton(this, wxID_ANY, _("Generate a New Statistics Identity"), wxDefaultPosition, wxSize(350, 25));
#else
m_analytics_new_id = new wxButton(this, wxID_ANY, _("Generate a New Statistics Identity")); m_analytics_new_id = new wxButton(this, wxID_ANY, _("Generate a New Statistics Identity"));
#endif
m_throttler_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_throttler_array_string); m_throttler_choice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_throttler_array_string);
m_cpu_engine_radiobox = new wxRadioBox(this, wxID_ANY, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, m_cpu_engine_array_string, 0, wxRA_SPECIFY_ROWS); m_cpu_engine_radiobox = new wxRadioBox(this, wxID_ANY, _("CPU Emulator Engine"), wxDefaultPosition, wxDefaultSize, m_cpu_engine_array_string, 0, wxRA_SPECIFY_ROWS);