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

Short,sweet and fixes issue 5725

This commit is contained in:
Braden 2013-03-18 21:40:46 -05:00
parent 7c2c4662a7
commit befe6e6962
1 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -35,7 +35,7 @@ Core::GetWindowHandle().
#include "VideoBackendBase.h" #include "VideoBackendBase.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <ApplicationServices/ApplicationServices.h> #include <AppKit/AppKit.h>
#endif #endif
#include "Globals.h" // Local #include "Globals.h" // Local
@ -805,41 +805,13 @@ void CFrame::ToggleDisplayMode(bool bFullscreen)
#elif defined(HAVE_XRANDR) && HAVE_XRANDR #elif defined(HAVE_XRANDR) && HAVE_XRANDR
m_XRRConfig->ToggleDisplayMode(bFullscreen); m_XRRConfig->ToggleDisplayMode(bFullscreen);
#elif defined __APPLE__ #elif defined __APPLE__
if (!bFullscreen) { NSView* view = (NSView *)m_RenderFrame->GetHandle();
CGRestorePermanentDisplayConfiguration(); [[view window] toggleFullScreen:[view window]];
CGDisplayRelease(CGMainDisplayID());
if(bFullscreen)
CGDisplayHideCursor(CGMainDisplayID());
else
CGDisplayShowCursor(CGMainDisplayID()); CGDisplayShowCursor(CGMainDisplayID());
return;
}
CGDisplayHideCursor(CGMainDisplayID());
CFArrayRef modes = CGDisplayAvailableModes(CGMainDisplayID());
for (CFIndex i = 0; i < CFArrayGetCount(modes); i++)
{
CFDictionaryRef mode;
CFNumberRef ref;
int x, y, w, h, d;
sscanf(SConfig::GetInstance().m_LocalCoreStartupParameter.\
strFullscreenResolution.c_str(), "%dx%d", &x, &y);
mode = (CFDictionaryRef)CFArrayGetValueAtIndex(modes, i);
ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayWidth);
CFNumberGetValue(ref, kCFNumberIntType, &w);
ref = (CFNumberRef)CFDictionaryGetValue(mode, kCGDisplayHeight);
CFNumberGetValue(ref, kCFNumberIntType, &h);
ref = (CFNumberRef)CFDictionaryGetValue(mode,
kCGDisplayBitsPerPixel);
CFNumberGetValue(ref, kCFNumberIntType, &d);
if (CFDictionaryContainsKey(mode, kCGDisplayModeIsStretched))
continue;
if (w != x || h != y || d != 32)
continue;;
CGDisplaySwitchToMode(CGMainDisplayID(), mode);
}
#endif #endif
} }