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-nativewindow.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-nativewindow.xml')
| -rw-r--r-- | make/build-nativewindow.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index a8408eaa7..d7ef73a46 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -691,8 +691,9 @@ <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.c}/win32" if="isWindows"/> <includepath path="${src.c}/x11" if="isX11"/> + <includepath path="${src.c}/macosx" if="isOSX"/> + <includepath path="${src.c}/win32" if="isWindows"/> <includepath path="${src.c}"/> <!-- This must come last to not override real include paths --> |