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

Add retina display support for Mac.

This commit is contained in:
Grant Paul 2013-03-31 11:36:42 -07:00
parent 31500f2522
commit aabd8ce664
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Info.plist.in
View File

@ -57,6 +57,8 @@
<string>${OSX_MIN_VERSION}</string> <string>${OSX_MIN_VERSION}</string>
<key>LSRequiresCarbon</key> <key>LSRequiresCarbon</key>
<true/> <true/>
<key>NSHighResolutionCapable</key>
<true/>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>
<true/> <true/>
</dict> </dict>

32
Source/Core/DolphinWX/Src/GLInterface/AGL.cpp
View File

@ -38,6 +38,17 @@ bool cInterfaceAGL::Create(void *&window_handle)
int _tx, _ty, _twidth, _theight; int _tx, _ty, _twidth, _theight;
Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight); Host_GetRenderWindowSize(_tx, _ty, _twidth, _theight);
GLWin.cocoaWin = (NSView*)(((wxPanel*)window_handle)->GetHandle());
// Enable high-resolution display support.
[GLWin.cocoaWin setWantsBestResolutionOpenGLSurface:YES];
NSWindow *window = [GLWin.cocoaWin window];
float scale = [window backingScaleFactor];
_twidth *= scale;
_theight *= scale;
// Control window size and picture scaling // Control window size and picture scaling
s_backbuffer_width = _twidth; s_backbuffer_width = _twidth;
s_backbuffer_height = _theight; s_backbuffer_height = _theight;
@ -58,16 +69,14 @@ bool cInterfaceAGL::Create(void *&window_handle)
return NULL; return NULL;
} }
GLWin.cocoaWin = (NSView*)(((wxPanel*)window_handle)->GetHandle());;
if (GLWin.cocoaWin == nil) { if (GLWin.cocoaWin == nil) {
ERROR_LOG(VIDEO, "failed to create window"); ERROR_LOG(VIDEO, "failed to create window");
return NULL; return NULL;
} }
[[GLWin.cocoaWin window] makeFirstResponder:GLWin.cocoaWin]; [window makeFirstResponder:GLWin.cocoaWin];
[GLWin.cocoaCtx setView: GLWin.cocoaWin]; [GLWin.cocoaCtx setView: GLWin.cocoaWin];
[[GLWin.cocoaWin window] makeKeyAndOrderFront: nil]; [window makeKeyAndOrderFront: nil];
return true; return true;
} }
@ -88,12 +97,19 @@ void cInterfaceAGL::Shutdown()
void cInterfaceAGL::Update() void cInterfaceAGL::Update()
{ {
if( s_backbuffer_width == [GLWin.cocoaWin frame].size.width NSWindow *window = [GLWin.cocoaWin window];
&& s_backbuffer_height == [GLWin.cocoaWin frame].size.height) NSSize size = [GLWin.cocoaWin frame].size;
float scale = [window backingScaleFactor];
size.width *= scale;
size.height *= scale;
if( s_backbuffer_width == size.width
&& s_backbuffer_height == size.height)
return; return;
s_backbuffer_width = [GLWin.cocoaWin frame].size.width; s_backbuffer_width = size.width;
s_backbuffer_height = [GLWin.cocoaWin frame].size.height; s_backbuffer_height = size.height;
[GLWin.cocoaCtx update]; [GLWin.cocoaCtx update];
} }