Merge pull request #63 from b23prodtm/master
macosx CALayer Display.create() / .setParent() / setFullscreen()
This commit is contained in:
commit
3ac0b43efd
|
@ -17,3 +17,6 @@
|
||||||
/src/native/*/org_lwjgl_*.h
|
/src/native/*/org_lwjgl_*.h
|
||||||
/src/native/*/*/org_lwjgl_*.h
|
/src/native/*/*/org_lwjgl_*.h
|
||||||
/src/native/linux/org_lwjgl_opengl_Display.c
|
/src/native/linux/org_lwjgl_opengl_Display.c
|
||||||
|
|
||||||
|
nbproject/project.xml
|
||||||
|
/nbproject/private/
|
|
@ -89,25 +89,7 @@ abstract class MacOSXCanvasPeerInfo extends MacOSXPeerInfo {
|
||||||
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7172187
|
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7172187
|
||||||
addComponentListener(component);
|
addComponentListener(component);
|
||||||
|
|
||||||
if (SwingUtilities.getWindowAncestor(component.getParent()) != null) {
|
reSetLayerBounds(component, getHandle());
|
||||||
Point componentPosition = SwingUtilities.convertPoint(component, component.getLocation(), null);
|
|
||||||
Point parentPosition = SwingUtilities.convertPoint(component.getParent(), component.getLocation(), null);
|
|
||||||
|
|
||||||
if (componentPosition.getX() == parentPosition.getX() && componentPosition.getY() == parentPosition.getY()) {
|
|
||||||
insets = getWindowInsets(component);
|
|
||||||
|
|
||||||
top = insets != null ? insets.top : 0;
|
|
||||||
left = insets != null ? insets.left : 0;
|
|
||||||
|
|
||||||
int x = (int)componentPosition.getX()-left;
|
|
||||||
int y = (int)-componentPosition.getY()+top-component.getHeight();
|
|
||||||
|
|
||||||
int width = component.getWidth();
|
|
||||||
int height = component.getHeight();
|
|
||||||
|
|
||||||
nSetLayerBounds(getHandle(), x, y, width, height);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -130,54 +112,14 @@ abstract class MacOSXCanvasPeerInfo extends MacOSXPeerInfo {
|
||||||
|
|
||||||
public void componentMoved(ComponentEvent e) {
|
public void componentMoved(ComponentEvent e) {
|
||||||
|
|
||||||
if (SwingUtilities.getWindowAncestor(component.getParent()) != null) {
|
|
||||||
Point componentPosition = SwingUtilities.convertPoint(component, component.getLocation(), null);
|
|
||||||
Point parentPosition = SwingUtilities.convertPoint(component.getParent(), component.getLocation(), null);
|
|
||||||
|
|
||||||
if (componentPosition.getX() == parentPosition.getX() && componentPosition.getY() == parentPosition.getY()) {
|
|
||||||
Insets insets = getWindowInsets(component);
|
|
||||||
|
|
||||||
int top = insets != null ? insets.top : 0;
|
|
||||||
int left = insets != null ? insets.left : 0;
|
|
||||||
|
|
||||||
nSetLayerBounds(getHandle(), (int)componentPosition.getX()-left, (int)componentPosition.getY()-top, component.getWidth(), component.getHeight());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Insets insets = getInsets(component);
|
|
||||||
|
|
||||||
int top = insets != null ? insets.top : 0;
|
|
||||||
int left = insets != null ? insets.left : 0;
|
|
||||||
|
|
||||||
//nSetLayerPosition(getHandle(), component.getX() - left, component.getY() - top);
|
//nSetLayerPosition(getHandle(), component.getX() - left, component.getY() - top);
|
||||||
nSetLayerBounds(getHandle(), component.getX() - left, component.getY() - top, component.getWidth(), component.getHeight());
|
reSetLayerBounds(component, getHandle());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void componentResized(ComponentEvent e) {
|
public void componentResized(ComponentEvent e) {
|
||||||
|
|
||||||
if (SwingUtilities.getWindowAncestor(component.getParent()) != null) {
|
|
||||||
Point componentPosition = SwingUtilities.convertPoint(component, component.getLocation(), null);
|
|
||||||
Point parentPosition = SwingUtilities.convertPoint(component.getParent(), component.getLocation(), null);
|
|
||||||
|
|
||||||
if (componentPosition.getX() == parentPosition.getX() && componentPosition.getY() == parentPosition.getY()) {
|
|
||||||
Insets insets = getWindowInsets(component);
|
|
||||||
|
|
||||||
int top = insets != null ? insets.top : 0;
|
|
||||||
int left = insets != null ? insets.left : 0;
|
|
||||||
|
|
||||||
nSetLayerBounds(getHandle(), (int)componentPosition.getX()-left, (int)componentPosition.getY()-top, component.getWidth(), component.getHeight());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Insets insets = getInsets(component);
|
|
||||||
|
|
||||||
int top = insets != null ? insets.top : 0;
|
|
||||||
int left = insets != null ? insets.left : 0;
|
|
||||||
|
|
||||||
//nSetLayerPosition(getHandle(), component.getX() - left, component.getY() - top);
|
//nSetLayerPosition(getHandle(), component.getX() - left, component.getY() - top);
|
||||||
nSetLayerBounds(getHandle(), component.getX() - left, component.getY() - top, component.getWidth(), component.getHeight());
|
reSetLayerBounds(component, getHandle());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void componentShown(ComponentEvent e) {
|
public void componentShown(ComponentEvent e) {
|
||||||
|
@ -198,38 +140,43 @@ abstract class MacOSXCanvasPeerInfo extends MacOSXPeerInfo {
|
||||||
|
|
||||||
private static native void nSetLayerBounds(ByteBuffer peer_info_handle, int x, int y, int width, int height);
|
private static native void nSetLayerBounds(ByteBuffer peer_info_handle, int x, int y, int width, int height);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* fix for CALayer position not covering Canvas due to a Java 7 bug
|
||||||
|
* {@link http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7172187}
|
||||||
|
* @param component
|
||||||
|
* @param peer_info_handle
|
||||||
|
*/
|
||||||
|
private static void reSetLayerBounds(Canvas component, ByteBuffer peer_info_handle) {
|
||||||
|
// report the root parent (peer).
|
||||||
|
Component peer = SwingUtilities.getRoot(component);
|
||||||
|
|
||||||
|
Point rtLoc = SwingUtilities.convertPoint(component.getParent(), component.getLocation(), peer);
|
||||||
|
int x = (int) rtLoc.getX(), y = (int) rtLoc.getY();
|
||||||
|
|
||||||
|
Insets insets = getInsets(component);
|
||||||
|
x -= insets != null ? insets.left : 0;
|
||||||
|
y -= insets != null ? insets.top : 0;
|
||||||
|
|
||||||
|
// http://hg.openjdk.java.net/jdk8/awt/jdk/rev/65d874d16d59
|
||||||
|
y = (int) peer.getHeight() - y - (int) component.getHeight();
|
||||||
|
|
||||||
|
nSetLayerBounds(peer_info_handle, x, y, component.getWidth(), component.getHeight());
|
||||||
|
}
|
||||||
|
|
||||||
protected void doUnlock() throws LWJGLException {
|
protected void doUnlock() throws LWJGLException {
|
||||||
awt_surface.unlock();
|
awt_surface.unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the Insets of the Window holding the Canvas
|
* @return rootpane insets (peer insets) values.
|
||||||
*/
|
*/
|
||||||
private Insets getWindowInsets(Canvas canvas) {
|
private static Insets getInsets(Canvas component) {
|
||||||
Container parent = canvas.getParent();
|
Container c = SwingUtilities.getRootPane(component);
|
||||||
|
|
||||||
while (parent != null) {
|
if(c != null) {
|
||||||
if(parent instanceof Window || parent instanceof java.applet.Applet) {
|
return c.getInsets();
|
||||||
return parent.getInsets();
|
} else {
|
||||||
}
|
return new Insets(0, 0, 0, 0);
|
||||||
|
}
|
||||||
parent = parent.getParent();
|
|
||||||
}
|
|
||||||
|
|
||||||
// if no parent Window or Applet found, return null
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Insets getInsets(Canvas component) {
|
|
||||||
Component parent = component.getParent();
|
|
||||||
|
|
||||||
while (parent != null) {
|
|
||||||
if (parent instanceof Container) {
|
|
||||||
return ((Container)parent).getInsets();
|
|
||||||
}
|
|
||||||
parent = parent.getParent();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,13 +76,12 @@ JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_MacOSXCanvasPeerInfo_nInitHandle
|
||||||
peer_info->glLayer = [GLLayer new];
|
peer_info->glLayer = [GLLayer new];
|
||||||
|
|
||||||
peer_info->glLayer->macosx_dsi = macosx_dsi;
|
peer_info->glLayer->macosx_dsi = macosx_dsi;
|
||||||
peer_info->glLayer->canvasBounds = (JAWT_Rectangle)surface->dsi->bounds;
|
|
||||||
peer_info->window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
|
peer_info->window_info = (MacOSXWindowInfo *)(*env)->GetDirectBufferAddress(env, window_handle);
|
||||||
peer_info->glLayer->window_info = peer_info->window_info;
|
peer_info->glLayer->window_info = peer_info->window_info;
|
||||||
peer_info->glLayer->autoResizable = autoResizable;
|
peer_info->glLayer->autoResizable = autoResizable;
|
||||||
|
|
||||||
// ensure the CALayer size is correct, needed for Java 7+
|
/* we set bounds as requested w/ frame function */
|
||||||
peer_info->glLayer.frame = CGRectMake(x, y, peer_info->glLayer->canvasBounds.width, peer_info->glLayer->canvasBounds.height);
|
peer_info->glLayer.frame = CGRectMake(x, y, surface->dsi->bounds.width, surface->dsi->bounds.height);
|
||||||
|
|
||||||
[peer_info->glLayer performSelectorOnMainThread:@selector(createWindow:) withObject:peer_info->pixel_format waitUntilDone:YES];
|
[peer_info->glLayer performSelectorOnMainThread:@selector(createWindow:) withObject:peer_info->pixel_format waitUntilDone:YES];
|
||||||
|
|
||||||
|
@ -144,11 +143,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXCanvasPeerInfo_nSetLayerBound
|
||||||
|
|
||||||
if (surfaceLayers.layer != self) {
|
if (surfaceLayers.layer != self) {
|
||||||
surfaceLayers.layer = self;
|
surfaceLayers.layer = self;
|
||||||
|
|
||||||
// flip CALayer y position, needed for Java 7 workaround
|
|
||||||
self.frame = CGRectMake(self.frame.origin.x,
|
|
||||||
self.superlayer.bounds.size.height - self.frame.origin.y - self.frame.size.height,
|
|
||||||
self.frame.size.width, self.frame.size.height);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -171,12 +165,13 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXCanvasPeerInfo_nSetLayerBound
|
||||||
|
|
||||||
- (void)updatePosition:(NSValue*)value {
|
- (void)updatePosition:(NSValue*)value {
|
||||||
NSPoint point = [value pointValue];
|
NSPoint point = [value pointValue];
|
||||||
self.position = CGPointMake(point.x, self.superlayer.bounds.size.height - point.y - self.bounds.size.height);
|
self.position = CGPointMake(point.x, point.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)updateBounds:(NSValue*)value {
|
- (void)updateBounds:(NSValue*)value {
|
||||||
NSRect rect = [value rectValue];
|
NSRect rect = [value rectValue];
|
||||||
self.frame = CGRectMake(rect.origin.x, self.superlayer.bounds.size.height - rect.origin.y - self.bounds.size.height, rect.size.width, rect.size.height);
|
self.frame = CGRectMake(rect.origin.x, rect.origin.y,
|
||||||
|
rect.size.width, rect.size.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (int) getWidth {
|
- (int) getWidth {
|
||||||
|
|
Loading…
Reference in New Issue