aboutsummaryrefslogtreecommitdiffstats
path: root/src/newt/classes/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-09-10 01:48:10 +0200
committerSven Gothel <[email protected]>2019-09-10 01:48:10 +0200
commitee3ee1ffa22a6fb6a0a25b6a547ee90f80e2ef4d (patch)
tree22a70d44b8d2c7811a3e363ec99a23a18149e6d7 /src/newt/classes/jogamp
parent9332937b86f329f483f3281780278c275b422e39 (diff)
NEWT Cleanup: WindowImpl: Drop unused 'defer' argument (state change only): insetsChanged + insetsVisibleChanged
Diffstat (limited to 'src/newt/classes/jogamp')
-rw-r--r--src/newt/classes/jogamp/newt/WindowImpl.java21
-rw-r--r--src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java2
-rw-r--r--src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java2
-rw-r--r--src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java2
4 files changed, 11 insertions, 16 deletions
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index 953935071..0f30f9458 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -4607,8 +4607,6 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
/**
* Triggered by implementation's WM events to update the insets.
- *
- * @param defer
* @param left insets, -1 ignored
* @param right insets, -1 ignored
* @param top insets, -1 ignored
@@ -4617,7 +4615,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
* @see #getInsets()
* @see #updateInsetsImpl(Insets)
*/
- protected void insetsChanged(final boolean defer, final int left, final int right, final int top, final int bottom) {
+ protected final void insetsChanged(final int left, final int right, final int top, final int bottom) {
if ( left >= 0 && right >= 0 && top >= 0 && bottom >= 0 ) {
final boolean changed = left != insets.getLeftWidth() || right != insets.getRightWidth() ||
top != insets.getTopHeight() || bottom != insets.getBottomHeight();
@@ -4625,12 +4623,12 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
if( blockInsetsChange || isUndecorated() ) {
if(DEBUG_IMPLEMENTATION) {
if( changed ) {
- System.err.println("Window.insetsChanged (defer: "+defer+"): Skip insets change "+insets+" -> "+new Insets(left, right, top, bottom)+" (blocked "+blockInsetsChange+", undecoration "+isUndecorated()+")");
+ System.err.println("Window.insetsChanged: Skip insets change "+insets+" -> "+new Insets(left, right, top, bottom)+" (blocked "+blockInsetsChange+", undecoration "+isUndecorated()+")");
}
}
} else if ( changed ) {
if(DEBUG_IMPLEMENTATION) {
- System.err.println("Window.insetsChanged (defer: "+defer+"): Changed "+insets+" -> "+new Insets(left, right, top, bottom));
+ System.err.println("Window.insetsChanged: Changed "+insets+" -> "+new Insets(left, right, top, bottom));
}
insets.set(left, right, top, bottom);
}
@@ -4786,18 +4784,15 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
}
/**
* Triggered by implementation's WM events to update the client-area position, size, insets and maximized flags.
- *
- * @param defer
* @param left insets, -1 ignored
* @param right insets, -1 ignored
* @param top insets, -1 ignored
* @param bottom insets, -1 ignored
* @param visibleChange -1 ignored, 0 invisible, > 0 visible
*/
- protected final void insetsVisibleChanged(final boolean defer,
- final int left, final int right, final int top, final int bottom,
- final int visibleChange) {
- insetsChanged(defer, left, right, top, bottom);
+ protected final void insetsVisibleChanged(final int left,
+ final int right, final int top, final int bottom, final int visibleChange) {
+ insetsChanged(left, right, top, bottom);
if( 0 <= visibleChange ) { // ignore visible < 0
visibleChanged(0 < visibleChange);
}
@@ -4827,7 +4822,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
final boolean force) {
sizeChanged(defer, newWidth, newHeight, force);
positionChanged(defer, newX, newY);
- insetsChanged(defer, left, right, top, bottom);
+ insetsChanged(left, right, top, bottom);
if( 0 <= focusChange ) { // ignore focus < 0
focusChanged(defer, 0 < focusChange);
}
@@ -4864,7 +4859,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
if( 0 <= maxHorzChange && 0 <= maxVertChange ) {
maximizedChanged(0 < maxHorzChange, 0 < maxVertChange);
}
- insetsChanged(defer, left, right, top, bottom);
+ insetsChanged(left, right, top, bottom);
if( 0 <= visibleChange ) { // ignore visible < 0
visibleChanged(0 < visibleChange);
}
diff --git a/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java
index 523fbf336..b72481f1b 100644
--- a/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/awt/WindowDriver.java
@@ -287,7 +287,7 @@ public class WindowDriver extends WindowImpl {
setCanvasSizeImpl(width, height);
awtContainer.setVisible( true );
final Insets contInsets = awtContainer.getInsets();
- insetsChanged(false, contInsets.left, contInsets.right, contInsets.top, contInsets.bottom);
+ insetsChanged(contInsets.left, contInsets.right, contInsets.top, contInsets.bottom);
} else {
awtContainer.setVisible( false );
}
diff --git a/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java
index 7706b9fe1..f84afc8f8 100644
--- a/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/ios/WindowDriver.java
@@ -609,7 +609,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
}
sizeChanged(defer, newWidth, newHeight, force);
screenPositionChanged(defer, newX, newY);
- insetsChanged(defer, left, right, top, bottom);
+ insetsChanged(left, right, top, bottom);
if( !withinLiveResize && resizeAnimatorPaused ) {
resizeAnimatorPaused = false;
if( null!=lh ) {
diff --git a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
index d41411e02..631dfced9 100644
--- a/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
+++ b/src/newt/classes/jogamp/newt/driver/macosx/WindowDriver.java
@@ -614,7 +614,7 @@ public class WindowDriver extends WindowImpl implements MutableSurface, DriverCl
}
sizeChanged(defer, newWidth, newHeight, force);
screenPositionChanged(defer, newX, newY);
- insetsChanged(defer, left, right, top, bottom);
+ insetsChanged(left, right, top, bottom);
if( !withinLiveResize && resizeAnimatorPaused ) {
resizeAnimatorPaused = false;
if( null!=lh ) {