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

Re-enable Double-click toggles Full-screen, added a checkbox on the GS Window config panel (default = enabled). 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4202 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
avihal@gmail.com 2011-01-11 22:18:15 +00:00
parent 80e9d9077f
commit 76ac40c614
5 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/gui/AppConfig.cpp
View File

@ -624,6 +624,8 @@ AppConfig::GSWindowOptions::GSWindowOptions()
WindowPos = wxDefaultPosition;
IsMaximized = false;
IsFullscreen = false;
IsToggleFullscreenOnDoubleClick = true;
}
void AppConfig::GSWindowOptions::SanityCheck()
@ -660,6 +662,8 @@ void AppConfig::GSWindowOptions::LoadSave( IniInterface& ini )
IniEntry( IsMaximized );
IniEntry( IsFullscreen );
IniEntry( IsToggleFullscreenOnDoubleClick );
static const wxChar* AspectRatioNames[] =
{
L"Stretch",

2
pcsx2/gui/AppConfig.h
View File

@ -175,6 +175,8 @@ public:
bool IsMaximized;
bool IsFullscreen;
bool IsToggleFullscreenOnDoubleClick;
GSWindowOptions();
void LoadSave( IniInterface& conf );

8
pcsx2/gui/FrameForGS.cpp
View File

@ -243,9 +243,11 @@ void GSPanel::AppStatusEvent_OnSettingsApplied()
void GSPanel::OnLeftDclick(wxMouseEvent& evt)
{
//need to add a config option for users which use mouse input. Till then, this feature is disabled.
//Console.WriteLn("GSPanel::OnDoubleClick: Invoking Fullscreen-Toggle accelerator.");
//DirectKeyCommand(FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL);
if( !g_Conf->GSWindow.IsToggleFullscreenOnDoubleClick )
return;
Console.WriteLn("GSPanel::OnDoubleClick: Invoking Fullscreen-Toggle accelerator.");
DirectKeyCommand(FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL);
}

1
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -270,6 +270,7 @@ namespace Panels
pxCheckBox* m_check_Fullscreen;
pxCheckBox* m_check_ExclusiveFS;
pxCheckBox* m_check_HideMouse;
pxCheckBox* m_check_DclickFullscreen;
wxTextCtrl* m_text_WindowWidth;
wxTextCtrl* m_text_WindowHeight;

7
pcsx2/gui/Panels/GSWindowPanel.cpp
View File

@ -46,6 +46,7 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
m_check_CloseGS = new pxCheckBox( this, _("Hide window on suspend") );
m_check_Fullscreen = new pxCheckBox( this, _("Default to fullscreen mode on open") );
m_check_VsyncEnable = new pxCheckBox( this, _("Wait for vsync on refresh") );
m_check_DclickFullscreen = new pxCheckBox( this, _("Double-click Toggles Full-Screen mode") );
m_check_ExclusiveFS = new pxCheckBox( this, _("Use exclusive fullscreen mode (if available)") );
m_check_VsyncEnable->SetToolTip( pxEt( "!ContextTip:Window:Vsync",
@ -98,6 +99,8 @@ Panels::GSWindowSettingsPanel::GSWindowSettingsPanel( wxWindow* parent )
*this += new wxStaticLine( this ) | StdExpand();
*this += m_check_Fullscreen;
*this += m_check_DclickFullscreen;;
*this += m_check_ExclusiveFS;
*this += m_check_VsyncEnable;
@ -126,6 +129,8 @@ void Panels::GSWindowSettingsPanel::ApplyConfigToGui( AppConfig& configToApply,
m_check_VsyncEnable ->SetValue( configToApply.EmuOptions.GS.VsyncEnable );
m_check_DclickFullscreen ->SetValue ( conf.IsToggleFullscreenOnDoubleClick );
m_text_WindowWidth ->SetValue( wxsFormat( L"%d", conf.WindowSize.GetWidth() ) );
m_text_WindowHeight ->SetValue( wxsFormat( L"%d", conf.WindowSize.GetHeight() ) );
@ -146,6 +151,8 @@ void Panels::GSWindowSettingsPanel::Apply()
gsconf.VsyncEnable = m_check_VsyncEnable->GetValue();
appconf.IsToggleFullscreenOnDoubleClick = m_check_DclickFullscreen->GetValue();
long xr, yr;
if( !m_text_WindowWidth->GetValue().ToLong( &xr ) || !m_text_WindowHeight->GetValue().ToLong( &yr ) )