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

Fix for F9 causing errant fullscreen/windowed mode flips. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3278 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-06-23 05:33:27 +00:00
parent c394708651
commit a2faa60643
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pcsx2/gui/AppMain.cpp
View File

@ -830,8 +830,22 @@ void Pcsx2App::OpenGsPanel()
if( gsFrame == NULL ) if( gsFrame == NULL )
{ {
gsFrame = new GSFrame( GetMainFramePtr(), GetAppName() ); gsFrame = new GSFrame( GetMainFramePtr(), GetAppName() );
//gsFrame->SetFocus();
m_id_GsFrame = gsFrame->GetId(); m_id_GsFrame = gsFrame->GetId();
switch( wxGetApp().Overrides.GsWindowMode )
{
case GsWinMode_Windowed:
g_Conf->GSWindow.IsFullscreen = false;
break;
case GsWinMode_Fullscreen:
g_Conf->GSWindow.IsFullscreen = true;
break;
case GsWinMode_Unspecified:
g_Conf->GSWindow.IsFullscreen = g_Conf->GSWindow.DefaultToFullscreen;
break;
}
} }
else else
{ {
@ -856,24 +870,9 @@ void Pcsx2App::OpenGsPanel()
} }
pxAssumeDev( !GetCorePlugins().IsOpen( PluginId_GS ), "GS Plugin must be closed prior to opening a new Gs Panel!" ); pxAssumeDev( !GetCorePlugins().IsOpen( PluginId_GS ), "GS Plugin must be closed prior to opening a new Gs Panel!" );
pDsp = (uptr)gsFrame->GetViewport()->GetHandle();
switch( wxGetApp().Overrides.GsWindowMode )
{
case GsWinMode_Windowed:
g_Conf->GSWindow.IsFullscreen = false;
break;
case GsWinMode_Fullscreen:
g_Conf->GSWindow.IsFullscreen = true;
break;
case GsWinMode_Unspecified:
g_Conf->GSWindow.IsFullscreen = g_Conf->GSWindow.DefaultToFullscreen;
break;
}
gsFrame->ShowFullScreen( g_Conf->GSWindow.IsFullscreen ); gsFrame->ShowFullScreen( g_Conf->GSWindow.IsFullscreen );
pDsp = (uptr)gsFrame->GetViewport()->GetHandle();
// The "in the main window" quickie hack... // The "in the main window" quickie hack...
//pDsp = (uptr)m_MainFrame->m_background.GetHandle(); //pDsp = (uptr)m_MainFrame->m_background.GetHandle();