Use monitor instead

Author: amartya4256

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java

@@ -16,6 +16,8 @@
 
 import java.io.*;
 
+import org.eclipse.swt.widgets.*;
+
 /**
  * Instances of this class represent places on the (x, y)
  * coordinate plane.
@@ -53,7 +55,7 @@ public final class Point implements Serializable {
 	 */
 	public int y;
 
-	public int zoom;
+	public Monitor monitor;
 
 	static final long serialVersionUID = 3257002163938146354L;
 

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java

@@ -17,6 +17,7 @@
 import java.io.*;
 
 import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
 
 /**
  * Instances of this class represent rectangular areas in an
@@ -67,7 +68,7 @@ public final class Rectangle implements Serializable {
 	 */
 	public int height;
 
-	public int zoom;
+	public Monitor monitor;
 
 	static final long serialVersionUID = 3256439218279428914L;
 

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MultiZoomCoordinateSystemMapper.java

@@ -98,19 +98,17 @@ public Point translateFromDisplayCoordinates(Point point, int zoom) {
 
 	@Override
 	public Point translateToDisplayCoordinates(Point point, int zoom) {
-		return translateLocationInPointsToDisplayCoordinateSystem(point.x, point.y);
+		return translateLocationInPointsToDisplayCoordinateSystem(point.x, point.y, point.monitor);
 	}
 
 	@Override
 	public Rectangle translateFromDisplayCoordinates(Rectangle rect, int zoom) {
-		return translateRectangleInPixelsFromDisplayCoordinateSystemByContainment(rect.x, rect.y, rect.width,
-				rect.height);
+		return translateRectangleInPixelsFromDisplayCoordinateSystemByContainment(rect.x, rect.y, rect.width, rect.height, rect.monitor);
 	}
 
 	@Override
 	public Rectangle translateToDisplayCoordinates(Rectangle rect, int zoom) {
-		return translateRectangleInPointsToDisplayCoordinateSystemByContainment(rect.x, rect.y, rect.width,
-				rect.height);
+		return translateRectangleInPointsToDisplayCoordinateSystemByContainment(rect.x, rect.y, rect.width, rect.height, rect.monitor);
 	}
 
 	@Override
@@ -120,13 +118,14 @@ public Point getCursorLocation() {
 	}
 
 	@Override
-	public void setCursorLocation(int x, int y) {
-		Point cursorLocationInPixels = translateLocationInPointsToDisplayCoordinateSystem(x, y);
-		display.setCursorLocationInPixels(cursorLocationInPixels.x, cursorLocationInPixels.y);
+	public void setCursorLocation (int x, int y) {
+		Point cursorLocationInPixels = translateLocationInPointsToDisplayCoordinateSystem(x, y, null);
+		display.setCursorLocationInPixels (cursorLocationInPixels.x, cursorLocationInPixels.y);
 	}
 
-	private Point translateLocationInPointsToDisplayCoordinateSystem(int x, int y) {
-		Monitor monitor = getContainingMonitor(x, y);
+	private Point translateLocationInPointsToDisplayCoordinateSystem(int x, int y, Monitor monitor) {
+		if (monitor == null)
+			monitor = getContainingMonitor(x, y);
 		return getPixelsFromPoint(monitor, x, y);
 	}
 
@@ -135,49 +134,39 @@ private Point translateLocationInPixelsFromDisplayCoordinateSystem(int x, int y)
 		return getPointFromPixels(monitor, x, y);
 	}
 
-	private Rectangle translateRectangleInPointsToDisplayCoordinateSystemByContainment(int x, int y, int width,
-			int height) {
-		Monitor monitorByLocation = getContainingMonitor(x, y);
-		Monitor monitorByContainment = getContainingMonitor(x, y, width, height);
-		return translateRectangleInPixelsInDisplayCoordinateSystem(x, y, width, height, monitorByLocation,
-				monitorByContainment);
+	private Rectangle translateRectangleInPointsToDisplayCoordinateSystemByContainment(int x, int y, int width, int height, Monitor monitor) {
+//		if in the gap i.e. getContainingMonitor(x, y, width, height) == null, use monitor, if monitor not available, use monitor [0]
+		if (monitor == null)
+			monitor = getContainingMonitor(x, y, width, height);
+		return translateRectangleInPixelsInDisplayCoordinateSystem(x, y, width, height, monitor);
 	}
 
-	private Rectangle translateRectangleInPixelsInDisplayCoordinateSystem(int x, int y, int width, int height,
-			Monitor monitor) {
-		return translateRectangleInPixelsInDisplayCoordinateSystem(x, y, width, height, monitor, monitor);
-	}
-
-	private Rectangle translateRectangleInPixelsInDisplayCoordinateSystem(int x, int y, int width, int height,
-			Monitor monitorOfLocation, Monitor monitorOfArea) {
-		Point topLeft = getPixelsFromPoint(monitorOfLocation, x, y);
-		int zoom = getApplicableMonitorZoom(monitorOfArea);
+	private Rectangle translateRectangleInPixelsInDisplayCoordinateSystem(int x, int y, int width, int height, Monitor monitor) {
+		Point topLeft = getPixelsFromPoint(monitor, x, y);
+		int zoom = getApplicableMonitorZoom(monitor);
 		int widthInPixels = DPIUtil.scaleUp(width, zoom);
 		int heightInPixels = DPIUtil.scaleUp(height, zoom);
 		return new Rectangle(topLeft.x, topLeft.y, widthInPixels, heightInPixels);
 	}
 
-	private Rectangle translateRectangleInPixelsFromDisplayCoordinateSystemByContainment(int x, int y,
-			int widthInPixels, int heightInPixels) {
-		Monitor monitorByLocation = getContainingMonitor(x, y);
-		Monitor monitorByContainment = getContainingMonitorInPixelsCoordinate(x, y, widthInPixels, heightInPixels);
+	private Rectangle translateRectangleInPixelsFromDisplayCoordinateSystemByContainment(int x, int y, int widthInPixels, int heightInPixels, Monitor monitor) {
+//		Monitor monitorByLocation = getContainingMonitor(x, y);
+		if (monitor == null)
+		// TODO
+			monitor = getContainingMonitor(x, y, widthInPixels, heightInPixels);
+			//		Monitor monitorByContainment = getContainingMonitorInPixelsCoordinate(x, y, widthInPixels, heightInPixels);
 		return translateRectangleInPointsInDisplayCoordinateSystem(x, y, widthInPixels, heightInPixels,
-				monitorByLocation, monitorByContainment);
-	}
-
-	private Rectangle translateRectangleInPointsInDisplayCoordinateSystem(int x, int y, int widthInPixels,
-			int heightInPixels, Monitor monitor) {
-		return translateRectangleInPointsInDisplayCoordinateSystem(x, y, widthInPixels, heightInPixels, monitor,
 				monitor);
 	}
 
-	private Rectangle translateRectangleInPointsInDisplayCoordinateSystem(int x, int y, int widthInPixels,
-			int heightInPixels, Monitor monitorOfLocation, Monitor monitorOfArea) {
-		Point topLeft = getPointFromPixels(monitorOfLocation, x, y);
-		int zoom = getApplicableMonitorZoom(monitorOfArea);
+	private Rectangle translateRectangleInPointsInDisplayCoordinateSystem(int x, int y, int widthInPixels, int heightInPixels, Monitor monitor) {
+		int zoom = getApplicableMonitorZoom(monitor);
+		Point topLeft = getPointFromPixels(monitor, x, y);
 		int width = DPIUtil.scaleDown(widthInPixels, zoom);
 		int height = DPIUtil.scaleDown(heightInPixels, zoom);
-		return new Rectangle(topLeft.x, topLeft.y, width, height);
+		Rectangle rect = new Rectangle(topLeft.x, topLeft.y, width, height);
+		rect.monitor = monitor;
+		return rect;
 	}
 
 	private Monitor getContainingMonitor(int x, int y) {
@@ -255,7 +244,9 @@ private Point getPointFromPixels(Monitor monitor, int x, int y) {
 		int zoom = getApplicableMonitorZoom(monitor);
 		int mappedX = DPIUtil.scaleDown(x - monitor.clientX, zoom) + monitor.clientX;
 		int mappedY = DPIUtil.scaleDown(y - monitor.clientY, zoom) + monitor.clientY;
-		return new Point(mappedX, mappedY);
+		Point pt = new Point(mappedX, mappedY);
+		pt.monitor = monitor;
+		return pt;
 	}
 
 	private int getApplicableMonitorZoom(Monitor monitor) {