From 12bbb049b716282321c979ae78918801ef071884 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 13 Jan 2020 06:52:22 +0100 Subject: Bug 1421, Bug 1358, Bug 969, Bug 672: Fix NEWT's coordinate conversion on MacOS (fixes NewtCanvasSWT on SWT positioning) Newt's OSX Window consist out of NSView wrapped up within its own NSWindow. It's position is being set via its NSWindow's client-area position on screen (frame), which we derive from NSView's client-area position. When NEWT reparents into a new 'window', on OSX it uses the parent's NSView and its NSWindow to attach its own NSView and NSWindow as a subview and childwindow. SWT's OSX implementation uses NSView's for each Compositor, but an individual NSWindow is only established for the Shell (Window). An oversight in Nativewindow and NEWT's coordinate translation: 'top-left view <-> top-left screen' by missing the 'view <-> window' translation caused this whole issue. The oversight occured as NEWT's 'view <-> window' translation had no impact due to its 1-view to 1-window mapping. Fixing the coordinate translation resolves the mess for SWT and for potential other toolkits on OSX. NewtCanvasSWT behaves same on OSX as on X11 etc finally. --- .../com/jogamp/nativewindow/swt/SWTAccessor.java | 23 ---------------------- 1 file changed, 23 deletions(-) (limited to 'src/nativewindow/classes/com') diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java b/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java index 97ffde5ee..b2428f7fa 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/swt/SWTAccessor.java @@ -721,27 +721,4 @@ public class SWTAccessor { public static void destroyGDKWindow(final long gdkWindow) { // OS.gdk_window_destroy (gdkWindow); } - - public static com.jogamp.nativewindow.util.Point getLocationOnScreen(final com.jogamp.nativewindow.util.Point storage, - Control comp) - { - while(null != comp) { - final org.eclipse.swt.graphics.Point p = comp.getLocation(); - final int dx = p.x; - final int dy = p.y; - storage.translate(dx, dy); - comp = comp.getParent(); - } - return storage; - } - public static Control getTopControl(Control comp) - { - Control last = null; - while(null != comp) { - last = comp; - comp = comp.getParent(); - } - return last; - } - } -- cgit v1.2.3