Merge pull request dolphin-emu#3924 from hthh/osx-gui-fix

OS X GUI: Fix truncated text
Ben754 · Jun 23, 2016 · 7804f38 · 7804f38
2 parents 439e537 + 45ad585
commit 7804f38
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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);