a4fb8a60b1
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
65 lines
1.9 KiB
Objective-C
65 lines
1.9 KiB
Objective-C
/*
|
|
* Copyright (C) 2011 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#include "NativeSubWindow.h"
|
|
#include <Cocoa/Cocoa.h>
|
|
|
|
/*
|
|
* EmuGLView inherit from NSView and override the isOpaque
|
|
* method to return YES. That prevents drawing of underlying window/view
|
|
* when the view needs to be redrawn.
|
|
*/
|
|
@interface EmuGLView : NSView {
|
|
} @end
|
|
|
|
@implementation EmuGLView
|
|
|
|
- (BOOL)isOpaque {
|
|
return YES;
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
EGLNativeWindowType createSubWindow(FBNativeWindowType p_window,
|
|
EGLNativeDisplayType* display_out,
|
|
int x, int y,int width, int 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) {
|
|
[[win contentView] addSubview:glView];
|
|
[win makeKeyAndOrderFront:nil];
|
|
}
|
|
|
|
return (EGLNativeWindowType)glView;
|
|
}
|
|
|
|
void destroySubWindow(EGLNativeDisplayType dis,EGLNativeWindowType win){
|
|
if(win){
|
|
NSView *glView = (NSView *)win;
|
|
[glView removeFromSuperview];
|
|
[glView release];
|
|
}
|
|
}
|