diff options
author | Sven Gothel <[email protected]> | 2014-02-25 17:16:47 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-02-25 17:16:47 +0100 |
commit | c2e6233c57f47c067dbb24f4a6a127fbaedf7a08 (patch) | |
tree | c807cedfcf9bab703fa9dedfbc7dc743e151059f | |
parent | 84395a04b63eec6dd9ecc90acde7e5570793f4fb (diff) |
Fix whitespaces of commit 78fcb8228d4a391054501aef16eb0462322ba39d and WindowImpl comment
-rw-r--r-- | src/newt/classes/com/jogamp/newt/swt/NewtCanvasSWT.java | 12 | ||||
-rw-r--r-- | src/newt/classes/jogamp/newt/WindowImpl.java | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/newt/classes/com/jogamp/newt/swt/NewtCanvasSWT.java b/src/newt/classes/com/jogamp/newt/swt/NewtCanvasSWT.java index dbb5c13bc..6f4be75f5 100644 --- a/src/newt/classes/com/jogamp/newt/swt/NewtCanvasSWT.java +++ b/src/newt/classes/com/jogamp/newt/swt/NewtCanvasSWT.java @@ -163,13 +163,13 @@ public class NewtCanvasSWT extends Canvas implements WindowClosingProtocol { addListener (SWT.Paint, listener); addListener (SWT.Dispose, listener); } - @Override + @Override public void setBounds(int x, int y, int w, int h) { // propagate the setBounds method coming from parent elements to this element // and force newtChild to update its position in OSX super.setBounds(x,y,w,h); if(SWTAccessor.isOSX) { - newtChild.setPosition(x, y); + newtChild.setPosition(x, y); clientArea.width = w; clientArea.height = h; updateSizeCheck(); @@ -208,8 +208,8 @@ public class NewtCanvasSWT extends Canvas implements WindowClosingProtocol { nativeWindow = new SWTNativeWindow(config, nativeWindowHandle); reparentWindow( true ); if(SWTAccessor.isOSX) { - // initial positioning for OSX, called when the window is created - newtChild.setPosition(getLocation().x, getLocation().y); + // initial positioning for OSX, called when the window is created + newtChild.setPosition(getLocation().x, getLocation().y); } } @@ -267,7 +267,7 @@ public class NewtCanvasSWT extends Canvas implements WindowClosingProtocol { nativeWindow = null; super.dispose(); } - + private Point getParentLocationOnScreen() { org.eclipse.swt.graphics.Point parentLoc = getParent().toDisplay(0,0); return new Point(parentLoc.x,parentLoc.y); @@ -519,7 +519,7 @@ public class NewtCanvasSWT extends Canvas implements WindowClosingProtocol { public Point getLocationOnScreen(Point point) { final Point los; // client window location on screen if( SWTAccessor.isOSX ) { - // let getLOS provide the point where the child window may be placed + // let getLOS provide the point where the child window may be placed // from, as taken from SWT Control.toDisplay(); los = getParentLocationOnScreen(); } else if (SWTAccessor.isX11) { diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index 5a5e0cc3d..9593d4faa 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -2107,7 +2107,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer if(DEBUG_IMPLEMENTATION) { System.err.println("Window setPosition: "+getX()+"/"+getY()+" -> "+x+"/"+y+", fs "+fullscreen+", windowHandle "+toHexString(windowHandle)); } - // let the window be resized as long as the parent is there + // Let the window be positioned if !fullscreen and position changed or being a child window. if ( !isFullscreen() && ( getX() != x || getY() != y || null != getParent()) ) { if(isNativeValid()) { // this.x/this.y will be set by sizeChanged, triggered by windowing event system |