diff options
author | Sven Gothel <[email protected]> | 2019-09-10 01:38:08 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-09-10 01:38:08 +0200 |
commit | 9332937b86f329f483f3281780278c275b422e39 (patch) | |
tree | 90caf12fa2579502f7b93a472d977209125b82f6 /src/newt/classes/jogamp | |
parent | 7e76df3a05b7eb2404cb4584ee0b34ea287eb9bf (diff) |
NEWT Cleanup: WindowImpl::visibleChanged(ZZ): Remove unused 'defer' argument. Method only changes state.
Diffstat (limited to 'src/newt/classes/jogamp')
10 files changed, 32 insertions, 32 deletions
diff --git a/src/newt/classes/jogamp/newt/OffscreenWindow.java b/src/newt/classes/jogamp/newt/OffscreenWindow.java index f4b8ecd42..da940541e 100644 --- a/src/newt/classes/jogamp/newt/OffscreenWindow.java +++ b/src/newt/classes/jogamp/newt/OffscreenWindow.java @@ -72,7 +72,7 @@ public class OffscreenWindow extends WindowImpl implements MutableSurface { synchronized(OffscreenWindow.class) { setWindowHandle(nextWindowHandle++); // just a marker } - visibleChanged(false, true); + visibleChanged(true); } @Override @@ -124,7 +124,7 @@ public class OffscreenWindow extends WindowImpl implements MutableSurface { protected boolean reconfigureWindowImpl(final int x, final int y, final int width, final int height, final int flags) { sizeChanged(false, width, height, false); if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } else { /** * silently ignore: diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index b2e727355..953935071 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -924,7 +924,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer * * @see #windowDestroyNotify(boolean) * @see #focusChanged(boolean, boolean) - * @see #visibleChanged(boolean, boolean) + * @see #visibleChanged(boolean) * @see #sizeChanged(int,int) * @see #positionChanged(boolean,int, int) * @see #windowDestroyNotify(boolean) @@ -4428,10 +4428,10 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } /** Triggered by implementation's WM events to update the visibility state. */ - protected final void visibleChanged(final boolean defer, final boolean visible) { + protected final void visibleChanged(final boolean visible) { if( stateMask.put(STATE_BIT_VISIBLE, visible) != visible ) { if(DEBUG_IMPLEMENTATION) { - System.err.println("Window.visibleChanged ("+getThreadName()+"): (defer: "+defer+") visible "+(!visible)+" -> state "+getStateMaskString()+" - windowHandle "+toHexString(windowHandle)+" parentWindowHandle "+toHexString(parentWindowHandle)); + System.err.println("Window.visibleChanged ("+getThreadName()+"): visible "+(!visible)+" -> state "+getStateMaskString()+" - windowHandle "+toHexString(windowHandle)+" parentWindowHandle "+toHexString(parentWindowHandle)); } } } @@ -4741,7 +4741,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer final short eventType, final int modifiers, final int x, final int y, final short button, final float rotation) { if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } if( 0 < eventType ) { if( defer ) { @@ -4763,7 +4763,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer protected final void visibleChangedWindowRepaint(final boolean defer, final int visibleChange, final int x, final int y, final int width, final int height) { if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } windowRepaint(defer, x, y, width, height); } @@ -4781,7 +4781,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer focusChanged(defer, 0 < focusChange); } if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } /** @@ -4799,7 +4799,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer final int visibleChange) { insetsChanged(defer, left, right, top, bottom); if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } /** @@ -4832,7 +4832,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer focusChanged(defer, 0 < focusChange); } if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } /** @@ -4866,7 +4866,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer } insetsChanged(defer, left, right, top, bottom); if( 0 <= visibleChange ) { // ignore visible < 0 - visibleChanged(defer, 0 < visibleChange); + visibleChanged(0 < visibleChange); } } diff --git a/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java index af5d08da0..890680e93 100644 --- a/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/android/WindowDriver.java @@ -366,7 +366,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl implements Callback2 { // propagate data .. setGraphicsConfiguration(eglConfig); setWindowHandle(surfaceHandle); - visibleChanged(false, true); + visibleChanged(true); focusChanged(false, true); setupInputListener(true); @@ -483,7 +483,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl implements Callback2 { } } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return res; } diff --git a/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java index aa93dd9aa..523fbf336 100644 --- a/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java @@ -118,7 +118,7 @@ public class WindowDriver extends WindowImpl { if( withinLocalDispose ) { setupHandleAndGC(); definePosition(getX(), getY()); // clear AUTOPOS - visibleChanged(false, true); + visibleChanged(true); withinLocalDispose = false; } else { if(0!=getParentWindowHandle()) { @@ -316,7 +316,7 @@ public class WindowDriver extends WindowImpl { setGraphicsConfiguration(cfg); } } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } if( isVisible() ) { windowRepaint(false, 0, 0, getSurfaceWidth(), getSurfaceHeight()); diff --git a/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java index d19618bd1..df6c2336a 100644 --- a/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/bcm/egl/WindowDriver.java @@ -121,7 +121,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl { } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return true; } diff --git a/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java index b01928449..f00c075b5 100644 --- a/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/intel/gdl/WindowDriver.java @@ -115,7 +115,7 @@ public class WindowDriver extends jogamp.newt.WindowImpl { if(0 != ( STATE_MASK_VISIBLE & flags)) { ((DisplayDriver)getScreen().getDisplay()).setFocus(this); } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return true; diff --git a/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java index cc8a419d7..7706b9fe1 100644 --- a/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java @@ -205,7 +205,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl try { if(DEBUG_IMPLEMENTATION) { System.err.println("MacWindow.CloseAction "+Thread.currentThread().getName()); } final long handle = getWindowHandle(); - visibleChanged(true, false); + visibleChanged(false); setWindowHandle(0); surfaceHandle = 0; sscSurfaceHandle = 0; @@ -427,10 +427,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderOut0(getWindowHandle()); - visibleChanged(true, false); + visibleChanged(false); } } ); } else { - visibleChanged(true, false); + visibleChanged(false); } } final long oldWindowHandle = getWindowHandle(); @@ -458,7 +458,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl updateSizePosInsets0(getWindowHandle(), false); } } ); } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); if( hasFocus ) { requestFocusImpl(true); } @@ -491,10 +491,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderFront0(getWindowHandle()); - visibleChanged(true, true); + visibleChanged(true); } } ); } else { - visibleChanged(true, true); + visibleChanged(true); } } } else { diff --git a/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java index ce5d208db..6b5943ff1 100644 --- a/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/kd/WindowDriver.java @@ -103,7 +103,7 @@ public class WindowDriver extends WindowImpl { protected boolean reconfigureWindowImpl(final int x, final int y, int width, int height, final int flags) { if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { setVisible0(eglWindowHandle, 0 != ( STATE_MASK_VISIBLE & flags)); - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } if(0!=eglWindowHandle) { @@ -127,7 +127,7 @@ public class WindowDriver extends WindowImpl { } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } return true; diff --git a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java index bea07d976..d41411e02 100644 --- a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java @@ -210,7 +210,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl try { if(DEBUG_IMPLEMENTATION) { System.err.println("MacWindow.CloseAction "+Thread.currentThread().getName()); } final long handle = getWindowHandle(); - visibleChanged(true, false); + visibleChanged(false); setWindowHandle(0); surfaceHandle = 0; sscSurfaceHandle = 0; @@ -432,10 +432,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderOut0(getWindowHandle()); - visibleChanged(true, false); + visibleChanged(false); } } ); } else { - visibleChanged(true, false); + visibleChanged(false); } } final long oldWindowHandle = getWindowHandle(); @@ -463,7 +463,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl updateSizePosInsets0(getWindowHandle(), false); } } ); } - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); if( hasFocus ) { requestFocusImpl(true); } @@ -496,10 +496,10 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl @Override public void run() { orderFront0(getWindowHandle()); - visibleChanged(true, true); + visibleChanged(true); } } ); } else { - visibleChanged(true, true); + visibleChanged(true); } } } else { diff --git a/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java index 020fe599b..2c6b4a37e 100644 --- a/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java +++ b/src/newt/classes/jogamp/newt/driver/windows/WindowDriver.java @@ -251,7 +251,7 @@ public class WindowDriver extends WindowImpl { } if( 0 != ( CHANGE_MASK_VISIBILITY & flags) ) { - visibleChanged(false, 0 != ( STATE_MASK_VISIBLE & flags)); + visibleChanged(0 != ( STATE_MASK_VISIBLE & flags)); } if(DEBUG_IMPLEMENTATION) { System.err.println("WindowsWindow reconfig.X: "+getX()+"/"+getY()+" "+getWidth()+"x"+getHeight()+", "+getStateMaskString()); |