diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp index 18f08a27df..b31b4d0533 100644 --- a/pcsx2/gui/FrameForGS.cpp +++ b/pcsx2/gui/FrameForGS.cpp @@ -176,7 +176,7 @@ void GSPanel::DoResize() // Allows for better real time toggling, returns to the non fmv override aspect ratio. switchAR = false; } - } else if (!switchAR) { + } else { if (g_Conf->GSWindow.AspectRatio == AspectRatio_4_3) { targetAr = 4.0 / 3.0; } else if (g_Conf->GSWindow.AspectRatio == AspectRatio_16_9) { diff --git a/pcsx2/gui/Panels/ConfigurationPanels.h b/pcsx2/gui/Panels/ConfigurationPanels.h index 5db6198bba..f0866de7ad 100644 --- a/pcsx2/gui/Panels/ConfigurationPanels.h +++ b/pcsx2/gui/Panels/ConfigurationPanels.h @@ -266,6 +266,14 @@ namespace Panels class GSWindowSettingsPanel : public BaseApplicableConfigPanel_SpecificConfig { protected: + // Exclusive mode is currently not used (true for svn r4399). + // PCSX2 has partial infrastructure for it: + // - The plugin APIs have GSsetExclusive. + // - GSdx seem to support it (it supports the API and has implementation), but I don't know if it ever got called. + // - BUT, the configuration (AppConfig, and specifically GSWindowOptions) do NOT seem to have a place to store this value, + // and PCSX2's code doesn't seem to use this API anywhere. So, no exclusive mode for now. + // - avih + wxComboBox* m_combo_AspectRatio; wxComboBox* m_combo_FMVAspectRatioSwitch; wxComboBox* m_combo_vsync; @@ -277,15 +285,6 @@ namespace Panels pxCheckBox* m_check_VsyncEnable; pxCheckBox* m_check_Fullscreen; - //Exclusive mode is currently not used (true for svn r4399). - //PCSX2 has partial infrastructure for it: - // - The plugin APIs have GSsetExclusive. - // - GSdx seem to support it (it supports the API and has implementation), but I don't know if it ever got called. - // - BUT, the configuration (AppConfig, and specifically GSWindowOptions) do NOT seem to have a place to store this value, - // and PCSX2's code doesn't seem to use this API anywhere. So, no exclusive mode for now. - // - avih - //pxCheckBox* m_check_ExclusiveFS; - pxCheckBox* m_check_HideMouse; pxCheckBox* m_check_DclickFullscreen; diff --git a/pcsx2/gui/Panels/GSWindowPanel.cpp b/pcsx2/gui/Panels/GSWindowPanel.cpp index b82607f59b..5a5f001148 100644 --- a/pcsx2/gui/Panels/GSWindowPanel.cpp +++ b/pcsx2/gui/Panels/GSWindowPanel.cpp @@ -69,7 +69,6 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent ) m_check_CloseGS = new pxCheckBox( this, _("Hide window when paused") ); m_check_Fullscreen = new pxCheckBox( this, _("Default to fullscreen mode on open") ); m_check_DclickFullscreen = new pxCheckBox( this, _("Double-click toggles fullscreen mode") ); - //m_check_ExclusiveFS = new pxCheckBox( this, _("Use exclusive fullscreen mode (if available)") ); m_combo_FMVAspectRatioSwitch->SetToolTip( pxEt( L"Off: Disables temporary aspect ratio switch.\n\n" L"4:3: Temporarily switch to a 4:3 aspect ratio while an FMV plays to correctly display an 4:3 FMV.\n\n" @@ -87,10 +86,6 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent ) m_check_Fullscreen->SetToolTip( pxEt( L"Enables automatic mode switch to fullscreen when starting or resuming emulation. You can still toggle fullscreen display at any time using alt-enter." ) ); -/* - m_check_ExclusiveFS->SetToolTip( pxEt( L"Fullscreen Exclusive Mode may look better on older CRTs and might be a little faster on older video cards, but typically can lead to memory leaks or random crashes when entering/leaving fullscreen mode." - ) ); -*/ m_check_CloseGS->SetToolTip( pxEt( L"Completely closes the often large and bulky GS window when pressing ESC or pausing the emulator." ) ); @@ -130,8 +125,6 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent ) *this += m_check_Fullscreen; *this += m_check_DclickFullscreen; - - //*this += m_check_ExclusiveFS; *this += new wxStaticLine( this ) | StdExpand(); *this += s_vsync | StdExpand();