summaryrefslogtreecommitdiffstats
path: root/src/newt/classes/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-09-01 06:12:50 +0200
committerSven Gothel <[email protected]>2011-09-01 06:12:50 +0200
commit51161b199d8c281ec19130565954353303cf44c6 (patch)
tree768cb7e6470a7f3179051e7faaaa5c5d3baa181c /src/newt/classes/jogamp
parent1aa8d4caa1d437b8c0f703c94848906458b10066 (diff)
NEWT/X11/Fullscreen: Fix Leaving FullScreen
NativeCode: "XChangeProperty( dpy, w, _NET_WM_STATE, XA_ATOM, 32, PropModeReplace, [ FULLSCREEN, ABOVE ] .." shall only be issued if entering FS, otherwise [ FULLSCREEN, ABOVE ] will be set on the client side at leaving FS, which is not intended. This caused a size reset to fullscreen size/mode. WindowImpl: Used WindowImpl.this.width and WindowImpl.this.height, where w and h should be used, the FS and pre-FS values.
Diffstat (limited to 'src/newt/classes/jogamp')
-rw-r--r--src/newt/classes/jogamp/newt/WindowImpl.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index 8e638c3b1..415de22fa 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -1031,7 +1031,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
}
// set visible again, and revalidate 'ok',
- // since it has been experience that in some cases the reparented window gets hidden
+ // since it has been experienced that in some cases the reparented window gets hidden
if(ok) {
display.dispatchMessagesNative(); // status up2date
if(wasVisible) {
@@ -1459,10 +1459,10 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
DisplayImpl display = (DisplayImpl) screen.getDisplay();
display.dispatchMessagesNative(); // status up2date
boolean wasVisible = isVisible();
- setVisibleImpl(false, x, y, width, height);
+ setVisibleImpl(false, x, y, w, h);
WindowImpl.this.waitForVisible(false, true);
display.dispatchMessagesNative(); // status up2date
-
+
// write back mirrored values, to be able to detect satisfaction
WindowImpl.this.x = x;
WindowImpl.this.y = y;
@@ -1472,7 +1472,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
display.dispatchMessagesNative(); // status up2date
if(wasVisible) {
- setVisibleImpl(true, x, y, width, height);
+ setVisibleImpl(true, x, y, w, h);
boolean ok = WindowImpl.this.waitForVisible(true, true, Screen.SCREEN_MODE_CHANGE_TIMEOUT);
display.dispatchMessagesNative(); // status up2date
if( ok &&
@@ -1485,7 +1485,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
System.err.println("Window fs (reconfig): "+x+"/"+y+" "+w+"x"+h+", "+screen);
}
// reset pos/size .. due to some native impl flakyness
- reconfigureWindowImpl(x, y, width, height, false, 0, 0);
+ reconfigureWindowImpl(x, y, w, h, false, 0, 0);
display.dispatchMessagesNative(); // status up2date
}
requestFocusImpl(true);