diff options
| author | Sven Gothel <[email protected]> | 2013-02-22 04:01:44 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-02-22 04:01:44 +0100 |
| commit | cbd8e33f1e19cf0c061c371af6930aba7c36b84f (patch) | |
| tree | 1d544d245a80622c6a5c258c1ad9cb4ee3cdb95c /make/build-jogl.xml | |
| parent | 405bc071d5d13e00d0561a485d31e3a7d61bf167 (diff) | |
Fix CALayer pos/size and animation.b01
- Fix CALayer animation:
- All CALayer animations are set to nil via overriding 'actionForKey'
- Fix CALayer pos/size bug:
- Fix root and sub CALayer position to 0/0 and size on the main-thread w/o blocking.
- If the sub CALayer implements the Objective-C NativeWindow protocol NWDedicatedSize (e.g. JOGL's MyNSOpenGLLayer),
the dedicated size is passed to the layer, which propagates it appropriately.
- On OSX/Java7 our root CALayer's frame position and size gets corrupted by its NSView,
hence we have created the NWDedicatedSize protocol.
Diffstat (limited to 'make/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 379758392..c481eb0f5 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -224,8 +224,9 @@ <property name="rootrel.generated.c.cg" value="${rootrel.src.generated}/native/jogl_cg" /> <!-- The source directories. --> - <property name="src.java" value="${project.root}/${rootrel.src.java}" /> - <property name="src.c" value="${project.root}/${rootrel.src.c}" /> + <property name="src.java" value="${project.root}/${rootrel.src.java}" /> + <property name="src.c" value="${project.root}/${rootrel.src.c}" /> + <property name="nativewindow.src.c" value="${project.root}/src/nativewindow/native" /> <!-- The generated source directories. --> <property name="src.generated" value="${build.jogl}/gensrc" /> @@ -1439,12 +1440,13 @@ <!-- This is for the generated headers for handwritten C code --> <includepath path="${src.c}"/> + <includepath path="${nativewindow.src.c}/macosx" if="isOSX"/> <includepath path="${src.generated.c}" /> - <includepath path="${src.generated.c}/X11" if="isX11"/> - <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> - <includepath path="${src.generated.c}/Windows" if="isWindows"/> + <includepath path="${src.generated.c}/X11" if="isX11"/> + <includepath path="${src.generated.c}/MacOSX" if="isOSX"/> + <includepath path="${src.generated.c}/Windows" if="isWindows"/> <includepath path="${src.generated.c.libav}" /> - <includepath path="${src.generated.c.openmax}" if="setup.addNativeOpenMAX"/> + <includepath path="${src.generated.c.openmax}" if="setup.addNativeOpenMAX"/> <!-- This must come last to not override real include paths --> <!-- includepath path="stub_includes/macosx" if="isOSX" / --> |