LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EmuGL: fix GL view position in window on OS X

Browse Source 
The code that creates the GL-accelerated screen view wasn't converting
the upper-left-relative coordinates used within the emulator to the
lower-left coordinates used by the Cocoa APIs on OS X. Since most
skins have the screen view centered vertically this often just
happened to work.

Bug: 5782118
Change-Id: I2f96ee181e850df5676d10a82d86c94421149b40
This commit is contained in:
Jesse Hall
2012-01-04 15:03:39 -08:00
parent 9fe60c34a4
commit a4fb8a60b1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/emulator/opengl/host/libs/libOpenglRender/NativeMacSubWindow.m
View File

@@ -36,10 +36,18 @@
EGLNativeWindowType createSubWindow(FBNativeWindowType p_window,
EGLNativeDisplayType* display_out,
int x, int y,int width, int height){
NSRect contentRect = NSMakeRect(x, y, width, height);
NSWindow *win = (NSWindow *)p_window;
if (!win) {
return NULL;
}
/* (x,y) assume an upper-left origin, but Cocoa uses a lower-left origin */
NSRect content_rect = [win contentRectForFrameRect:[win frame]];
int cocoa_y = (int)content_rect.size.height - (y + height);
NSRect contentRect = NSMakeRect(x, cocoa_y, width, height);
NSView *glView = [[EmuGLView alloc] initWithFrame:contentRect];
if (glView) {
NSWindow *win = (NSWindow *)p_window;
[[win contentView] addSubview:glView];
[win makeKeyAndOrderFront:nil];
}