Add auto fullscreen resolution option. Not tested on Linux, let me know if it doesn't work (it probably does).

Fixes issue 6082.
This commit is contained in:
Rachel Bryk
2013-05-25 03:03:12 -04:00
parent 026ab26755
commit 743230500f
2 changed files with 4 additions and 2 deletions

View File

@ -798,7 +798,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event)
void CFrame::ToggleDisplayMode(bool bFullscreen) void CFrame::ToggleDisplayMode(bool bFullscreen)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (bFullscreen) if (bFullscreen && SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
{ {
DEVMODE dmScreenSettings; DEVMODE dmScreenSettings;
memset(&dmScreenSettings,0,sizeof(dmScreenSettings)); memset(&dmScreenSettings,0,sizeof(dmScreenSettings));
@ -817,7 +817,8 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
ChangeDisplaySettings(NULL, CDS_FULLSCREEN); ChangeDisplaySettings(NULL, CDS_FULLSCREEN);
} }
#elif defined(HAVE_XRANDR) && HAVE_XRANDR #elif defined(HAVE_XRANDR) && HAVE_XRANDR
m_XRRConfig->ToggleDisplayMode(bFullscreen); if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto")
m_XRRConfig->ToggleDisplayMode(bFullscreen);
#elif defined __APPLE__ #elif defined __APPLE__
if(bFullscreen) if(bFullscreen)
CGDisplayHideCursor(CGMainDisplayID()); CGDisplayHideCursor(CGMainDisplayID());

View File

@ -131,6 +131,7 @@ wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails,
wxArrayString GetListOfResolutions() wxArrayString GetListOfResolutions()
{ {
wxArrayString retlist; wxArrayString retlist;
retlist.Add("Auto");
#ifdef _WIN32 #ifdef _WIN32
DWORD iModeNum = 0; DWORD iModeNum = 0;
DEVMODE dmi; DEVMODE dmi;