From 14ff638b63fc7adaa59f351891f6a38806d7fa5d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 8 Jun 2014 22:50:22 +0200
Subject: NEWT Window: Remove deprecated methods: HiDPI + reparentWindow(..)

Remove HiDPI pixel- from/to window-unit conversion and getter methods:
  Rectangle HiDPI pixel- from/to window-units are erroneous in case of multiple monitor setup where a mixed pixel-scale exist,
  since the methods didn't take the monitor viewport and each of it's pixel-scale into account (expensive).

Remove deprecated reparentWindow(..) methods.
---
 src/newt/classes/jogamp/newt/WindowImpl.java | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'src/newt/classes/jogamp')

diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java
index 0df105ff0..0501f6ad6 100644
--- a/src/newt/classes/jogamp/newt/WindowImpl.java
+++ b/src/newt/classes/jogamp/newt/WindowImpl.java
@@ -1585,16 +1585,6 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
     }
     private final ReparentActionRecreate reparentActionRecreate = new ReparentActionRecreate();
 
-    @Override
-    public final ReparentOperation reparentWindow(NativeWindow newParent) {
-        return reparentWindow(newParent, -1, -1, 0);
-    }
-
-    @Override
-    public final ReparentOperation reparentWindow(NativeWindow newParent, int x, int y, boolean forceDestroyCreate) {
-        return reparentWindow(newParent, x, y, forceDestroyCreate ? REPARENT_HINT_FORCE_RECREATION : 0);
-    }
-
     @Override
     public final ReparentOperation reparentWindow(NativeWindow newParent, int x, int y, int hints) {
         final ReparentAction reparentAction = new ReparentAction(newParent, x, y, hints);
@@ -1919,12 +1909,6 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
         return pixHeight;
     }
 
-    @Override
-    public final Rectangle getSurfaceBounds() {
-        // FIXME HiDPI: Shortcut, may need to adjust if we change scaling methodology
-        return new Rectangle(x * getPixelScaleX(), y * getPixelScaleY(), pixWidth, pixHeight);
-    }
-
     @Override
     public final int[] convertToWindowUnits(final int[] pixelUnitsAndResult) {
         pixelUnitsAndResult[0] /= getPixelScaleX();
@@ -1947,16 +1931,6 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer
         return windowUnitsAndResult.scale(getPixelScaleX(), getPixelScaleY());
     }
 
-    @Override
-    public final Rectangle convertToWindowUnits(final Rectangle pixelUnitsAndResult) {
-        return pixelUnitsAndResult.scaleInv(getPixelScaleX(), getPixelScaleY());
-    }
-
-    @Override
-    public final Rectangle convertToPixelUnits(final Rectangle windowUnitsAndResult) {
-        return windowUnitsAndResult.scale(getPixelScaleX(), getPixelScaleY());
-    }
-
     /** HiDPI: We currently base scaling of window units to pixel units on an integer scale factor per component. */
     protected final int getPixelScaleX() {
         return hasPixelScale[0];
-- 
cgit v1.2.3