diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2013-05-25 03:03:12 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2013-05-25 03:08:09 -0400 |
| commit | 743230500f1bdd2bdf29787fb84feaff407faca5 (patch) | |
| tree | 91c65d81e09b8557bf06dd6dd3e8b5c2f2c4923a /Source/Core | |
| parent | 026ab26755487de4693b73f7079c164cd56cda2f (diff) | |
Add auto fullscreen resolution option. Not tested on Linux, let me know if it doesn't work (it probably does).
Fixes issue 6082.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/VideoConfigDiag.cpp | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index c6d542bf85..8607fdb110 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -798,7 +798,7 @@ void CFrame::OnRenderParentResize(wxSizeEvent& event) void CFrame::ToggleDisplayMode(bool bFullscreen) { #ifdef _WIN32 - if (bFullscreen) + if (bFullscreen && SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto") { DEVMODE dmScreenSettings; memset(&dmScreenSettings,0,sizeof(dmScreenSettings)); @@ -817,7 +817,8 @@ void CFrame::ToggleDisplayMode(bool bFullscreen) ChangeDisplaySettings(NULL, CDS_FULLSCREEN); } #elif defined(HAVE_XRANDR) && HAVE_XRANDR - m_XRRConfig->ToggleDisplayMode(bFullscreen); + if (SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution != "Auto") + m_XRRConfig->ToggleDisplayMode(bFullscreen); #elif defined __APPLE__ if(bFullscreen) CGDisplayHideCursor(CGMainDisplayID()); diff --git a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp index 8c4ee9ebb4..5a7d11f96e 100644 --- a/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/Src/VideoConfigDiag.cpp @@ -131,6 +131,7 @@ wxString shader_errors_desc = wxTRANSLATE("Usually if shader compilation fails, wxArrayString GetListOfResolutions() { wxArrayString retlist; + retlist.Add("Auto"); #ifdef _WIN32 DWORD iModeNum = 0; DEVMODE dmi; |