diff options
author | Sven Gothel <[email protected]> | 2014-10-09 01:59:33 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-10-09 03:34:37 +0200 |
commit | da52dd1299ec9b4951893733e86d708391494af0 (patch) | |
tree | 0ec121234039a5b3a55e2c611c3be3152c67f999 /src/newt | |
parent | 279c5470bd99d6f9f3fdfd6aa91a2f9925c09f3b (diff) |
Newt Screen viewport in windows units: Add missing setup in overriden calcVirtualScreenOriginAndSize(..) method (duplicate pixel unit)
Diffstat (limited to 'src/newt')
6 files changed, 6 insertions, 0 deletions
diff --git a/src/newt/classes/jogamp/newt/driver/bcm/egl/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/bcm/egl/ScreenDriver.java index fab3fe882..2cd47313a 100644 --- a/src/newt/classes/jogamp/newt/driver/bcm/egl/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/bcm/egl/ScreenDriver.java @@ -110,6 +110,7 @@ public class ScreenDriver extends jogamp.newt.ScreenImpl { @Override protected void calcVirtualScreenOriginAndSize(final Rectangle viewport, final Rectangle viewportInWindowUnits) { viewport.set(0, 0, fixedWidth, fixedHeight); // FIXME + viewportInWindowUnits.set(viewport); } //---------------------------------------------------------------------- diff --git a/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java index e3e854cba..64cae75f6 100644 --- a/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/bcm/vc/iv/ScreenDriver.java @@ -103,6 +103,7 @@ public class ScreenDriver extends ScreenImpl { @Override protected void calcVirtualScreenOriginAndSize(final Rectangle viewport, final Rectangle viewportInWindowUnits) { viewport.set(0, 0, cachedWidth, cachedHeight); + viewportInWindowUnits.set(viewport); } /** Called from {@link #initNative()}. */ diff --git a/src/newt/classes/jogamp/newt/driver/intel/gdl/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/intel/gdl/ScreenDriver.java index b5400c386..2ce835c52 100644 --- a/src/newt/classes/jogamp/newt/driver/intel/gdl/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/intel/gdl/ScreenDriver.java @@ -112,6 +112,7 @@ public class ScreenDriver extends jogamp.newt.ScreenImpl { @Override protected void calcVirtualScreenOriginAndSize(final Rectangle viewport, final Rectangle viewportInWindowUnits) { viewport.set(0, 0, cachedWidth, cachedHeight); + viewportInWindowUnits.set(viewport); } //---------------------------------------------------------------------- diff --git a/src/newt/classes/jogamp/newt/driver/kd/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/kd/ScreenDriver.java index 71f8b1439..d4113561a 100644 --- a/src/newt/classes/jogamp/newt/driver/kd/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/kd/ScreenDriver.java @@ -108,6 +108,7 @@ public class ScreenDriver extends ScreenImpl { @Override protected void calcVirtualScreenOriginAndSize(final Rectangle viewport, final Rectangle viewportInWindowUnits) { viewport.set(0, 0, cachedWidth, cachedHeight); + viewportInWindowUnits.set(viewport); } protected void sizeChanged(final int w, final int h) { diff --git a/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java index 1cba421bc..38acd03ae 100644 --- a/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java @@ -158,6 +158,7 @@ public class ScreenDriver extends ScreenImpl { @Override protected void calcVirtualScreenOriginAndSize(final Rectangle viewport, final Rectangle viewportInWindowUnits) { viewport.set(getVirtualOriginX0(), getVirtualOriginY0(), getVirtualWidthImpl0(), getVirtualHeightImpl0()); + viewportInWindowUnits.set(viewport); } // Native calls diff --git a/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java index 1d779741a..f7361740e 100644 --- a/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java @@ -246,6 +246,7 @@ public class ScreenDriver extends ScreenImpl { @Override public Object run(final long dpy) { viewport.set(0, 0, getWidth0(dpy, screen_idx), getHeight0(dpy, screen_idx)); + viewportInWindowUnits.set(viewport); return null; } } ); if( DEBUG ) { |