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

Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1

Browse Source
This commit is contained in:
Jesse Hall
2012-01-09 15:51:40 -08:00
committed by Android (Google) Code Review
parent 5621efe11c a4fb8a60b1
commit 409c49c526
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, EGLNativeWindowType createSubWindow(FBNativeWindowType p_window,
EGLNativeDisplayType* display_out, EGLNativeDisplayType* display_out,
int x, int y,int width, int height){ 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]; NSView *glView = [[EmuGLView alloc] initWithFrame:contentRect];
if (glView) { if (glView) {
NSWindow *win = (NSWindow *)p_window;
[[win contentView] addSubview:glView]; [[win contentView] addSubview:glView];
[win makeKeyAndOrderFront:nil]; [win makeKeyAndOrderFront:nil];
} }