diff options
| author | hthh <hthh@hh.ht> | 2016-06-23 21:26:47 +1000 |
|---|---|---|
| committer | hthh <hthh@hh.ht> | 2016-06-23 22:17:53 +1000 |
| commit | 45ad585bafa40bdb19b659d64aa88d01c763ccaf (patch) | |
| tree | af7e0580110a2ccf44713479bdcbfd07724abace /Source | |
| parent | 49dd4a9f1e9e604ed78585c0d4e6033b512a8bfe (diff) | |
GUI: Fix truncated text on OS X
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Config/ConfigMain.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Config/GeneralConfigPane.cpp | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp index c18ad13300..79c193b239 100644 --- a/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp @@ -37,7 +37,12 @@ void AdvancedConfigPane::InitializeGUI() "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. ")); + +#ifdef __APPLE__ + clock_override_description->Wrap(550); +#else clock_override_description->Wrap(400); +#endif wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL); clock_override_checkbox_sizer->Add(m_clock_override_checkbox, 1, wxALL, 5); diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp index 1cd7421f65..ecd5af12f4 100644 --- a/Source/Core/DolphinWX/Config/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp @@ -81,7 +81,11 @@ void CConfigMain::CreateGUIControls() main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 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); +#endif SetSizerAndFit(main_sizer); Center(); diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp index ece70ee4a3..8e322175c9 100644 --- a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp @@ -59,7 +59,11 @@ void GeneralConfigPane::InitializeGUI() 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_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")); +#endif 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); |