From 2b6d44a043e00484edf22bc91a85337d4d9837e9 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Thu, 3 Sep 2015 17:22:12 +0100 Subject: [PATCH] gui: Fix Emulation Settings dialog, GS section Expand "Disable Framelimiting" and "Synchronised MTGS". Fixes message truncation on Linux, and Windows at higher DPI. Don't use pxFitDigits on Spin Controls - the sizing algorithm fails horribly on GTK3, which means you can't see anything. And don't use a row of spacers - it causes a minor display issue with GTK3. --- pcsx2/gui/Panels/VideoPanel.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pcsx2/gui/Panels/VideoPanel.cpp b/pcsx2/gui/Panels/VideoPanel.cpp index f7d6df5286..d9dd111b87 100644 --- a/pcsx2/gui/Panels/VideoPanel.cpp +++ b/pcsx2/gui/Panels/VideoPanel.cpp @@ -37,9 +37,9 @@ Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent ) m_check_LimiterDisable->SetToolTip( pxEt( L"Note that when Framelimiting is disabled, Turbo and SlowMotion modes will not be available either." ) ); - pxFitToDigits( m_spin_NominalPct = new wxSpinCtrl( this ), 6 ); - pxFitToDigits( m_spin_SlomoPct = new wxSpinCtrl( this ), 6 ); - pxFitToDigits( m_spin_TurboPct = new wxSpinCtrl( this ), 6 ); + m_spin_NominalPct = new wxSpinCtrl(this); + m_spin_SlomoPct = new wxSpinCtrl(this); + m_spin_TurboPct = new wxSpinCtrl(this); m_text_BaseNtsc = CreateNumericalTextCtrl( this, 7 ); m_text_BasePal = CreateNumericalTextCtrl( this, 7 ); @@ -51,7 +51,7 @@ Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent ) // ------------------------------------------------------------ // Sizers and Layouts - *this += m_check_LimiterDisable; + *this += m_check_LimiterDisable | StdExpand(); wxFlexGridSizer& s_spins( *new wxFlexGridSizer( 5 ) ); s_spins.AddGrowableCol( 0 ); @@ -74,12 +74,6 @@ Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent ) s_spins += Label(L"%" ) | StdExpand(); s_spins += 5; - s_spins += 15; - s_spins += 15; - s_spins += 15; - s_spins += 15; - s_spins += 15; - wxFlexGridSizer& s_fps( *new wxFlexGridSizer( 5 ) ); s_fps.AddGrowableCol( 0 ); @@ -96,6 +90,7 @@ Panels::FramelimiterPanel::FramelimiterPanel( wxWindow* parent ) s_fps += 5; *this += s_spins | pxExpand; + *this += 5; *this += s_fps | pxExpand; AppStatusEvent_OnSettingsApplied(); @@ -196,8 +191,8 @@ Panels::FrameSkipPanel::FrameSkipPanel( wxWindow* parent ) m_radio_SkipMode = new pxRadioPanel( this, FrameskipOptions ); m_radio_SkipMode->Realize(); - pxFitToDigits( m_spin_FramesToDraw = new wxSpinCtrl( this ), 6 ); - pxFitToDigits( m_spin_FramesToSkip = new wxSpinCtrl( this ), 6 ); + m_spin_FramesToDraw = new wxSpinCtrl(this); + m_spin_FramesToSkip = new wxSpinCtrl(this); // Set tooltips for spinners. @@ -325,7 +320,7 @@ Panels::VideoPanel::VideoPanel( wxWindow* parent ) : *left += m_fpan | pxExpand; *left += 5; - *left += m_check_SynchronousGS; + *left += m_check_SynchronousGS | StdExpand(); *left += m_check_DisableOutput; *s_table += left | StdExpand();