aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-08-11 02:43:08 +0200
committerSven Gothel <[email protected]>2015-08-11 02:43:08 +0200
commit9ad7f6d6ffe975dc0a10dac159b8de32773e1da1 (patch)
tree17ca00ff7b3fd1ffb4d41dab5842363182090e24
parentb8a1403da44af1eb31bc87e71ee9788cb831117b (diff)
Bug 1188: Fix regression on OSX setVisible: in-visibility never reached on child windows / Fix [Un}Resizable style
- Fix regression on OSX setVisible: in-visibility never reached on child windows - Fix 'typo' while porting to bit-mask, i.e. '!=' -> '=='. - Fix [Un}Resizable style - Use NSResizableWindowMask only for !Undecorated and if STATE_MASK_RESIZABLE is set.
-rw-r--r--src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
index deaba5f0c..31ef278ee 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
@@ -424,7 +424,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
}
if( 0 != ( CHANGE_MASK_VISIBILITY & flags) &&
- 0 != ( STATE_MASK_VISIBLE & flags) )
+ 0 == ( STATE_MASK_VISIBLE & flags) )
{
if ( !isOffscreenInstance ) {
OSXUtil.RunOnMainThread(false, false, new Runnable() {
@@ -704,10 +704,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
if( 0 != ( STATE_MASK_UNDECORATED & flags) || offscreenInstance ) {
ws = NSBorderlessWindowMask;
} else {
- ws = NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask;
- }
- if( 0 != ( STATE_MASK_RESIZABLE & flags) ) {
- ws |= NSResizableWindowMask;
+ ws = NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask;
+ if( 0 != ( STATE_MASK_RESIZABLE & flags) ) {
+ ws |= NSResizableWindowMask;
+ }
}
windowStyle = ws;
}