diff options
| author | Sven Gothel <[email protected]> | 2015-08-20 23:23:28 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-08-20 23:23:28 +0200 |
| commit | 417546510a93de533562b631caa4a75feeecd793 (patch) | |
| tree | 0a9872bcf4648a7934039902b37ea0a9d9924630 | |
| parent | 1b1dc62e3e3988dce16e980e7bf8d32509a7562f (diff) | |
Bug 1188: Refine reconfig state bits
| -rw-r--r-- | src/newt/classes/jogamp/newt/WindowImpl.java | 12 | ||||
| -rw-r--r-- | src/newt/classes/jogamp/newt/driver/x11/WindowDriver.java | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index ddcbd0d90..4015da80d 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -197,11 +197,11 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer // // Additional private reconfigure state-mask bits and mask values // - /* pp */ static final int STATE_BIT_FULLSCREEN_SPAN = STATE_BIT_COUNT_ALL_PUBLIC; + protected static final int STATE_BIT_FULLSCREEN_SPAN = STATE_BIT_COUNT_ALL_PUBLIC; - protected static final int STATE_BIT_COUNT_RECONFIG = STATE_BIT_FULLSCREEN_SPAN + 1; - /** Bitmask for {@link #STATE_BIT_COUNT_RECONFIG} */ - protected static final int STATE_MASK_ALL_RECONFIG = ( 1 << STATE_BIT_COUNT_RECONFIG ) - 1; + protected static final int STATE_BIT_COUNT_ALL_RECONFIG = STATE_BIT_FULLSCREEN_SPAN + 1; + /** Bitmask for {@link #STATE_BIT_COUNT_ALL_RECONFIG} */ + protected static final int STATE_MASK_ALL_RECONFIG = ( 1 << STATE_BIT_COUNT_ALL_RECONFIG ) - 1; // // Additional private non-reconfigure state-mask bits and mask values @@ -213,7 +213,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer /* pp */ static final int PSTATE_BIT_FULLSCREEN_NFS_RESIZABLE = 31; // non fullscreen resizable setting /** Bitmask for {@link #STATE_BIT_FULLSCREEN_SPAN}, {@value}. */ - /* pp */ static final int STATE_MASK_FULLSCREEN_SPAN = 1 << STATE_BIT_FULLSCREEN_SPAN; + protected static final int STATE_MASK_FULLSCREEN_SPAN = 1 << STATE_BIT_FULLSCREEN_SPAN; /* pp */ static final int PSTATE_MASK_FOCUS_CHANGE_BROKEN = 1 << PSTATE_BIT_FOCUS_CHANGE_BROKEN; /* pp */ static final int PSTATE_MASK_FULLSCREEN_MAINMONITOR = 1 << PSTATE_BIT_FULLSCREEN_MAINMONITOR; @@ -877,7 +877,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } protected int getReconfigureMask(final int changeFlags, final boolean visible) { - final int smask = stateMask.get32(0, STATE_BIT_COUNT_RECONFIG); + final int smask = stateMask.get32(0, STATE_BIT_COUNT_ALL_RECONFIG); return changeFlags | ( smask & ~STATE_MASK_VISIBLE ) | ( visible ? STATE_MASK_VISIBLE : 0 ) diff --git a/src/newt/classes/jogamp/newt/driver/x11/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/x11/WindowDriver.java index 5b6ea45d5..cdd22d277 100644 --- a/src/newt/classes/jogamp/newt/driver/x11/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/x11/WindowDriver.java @@ -170,10 +170,10 @@ public class WindowDriver extends WindowImpl { } /** + * {@inheritDoc} * <p> - * X11 Window supports {@link #FLAG_IS_FULLSCREEN_SPAN} + * X11 Window supports {@link #STATE_BIT_FULLSCREEN_SPAN}. * </p> - * {@inheritDoc} */ @Override protected boolean isReconfigureMaskSupported(final int changeFlags) { |