WIP: Make DnD consumer monitorAware

Author: amartya4256

bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DetachedDropAgent.java

@@ -22,6 +22,8 @@
 import org.eclipse.e4.ui.workbench.IPresentationEngine;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.MonitorAwarePoint;
+import org.eclipse.swt.graphics.MonitorAwareRectangle;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Control;
@@ -96,6 +98,10 @@ public Rectangle getRectangle(MUIElement dragElement) {
 		Point cp = Display.getCurrent().getCursorLocation();
 		curRect.x = cp.x - 15;
 		curRect.y = cp.y - 15;
+		if (cp instanceof MonitorAwarePoint monitorAwareCp) {
+			return new MonitorAwareRectangle(curRect.x, curRect.y, curRect.width, curRect.height,
+					monitorAwareCp.getMonitor());
+		}
 
 		return curRect;
 	}

bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/dndaddon/DnDManager.java

@@ -35,6 +35,7 @@
 import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.MonitorAwareRectangle;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.graphics.Region;
 import org.eclipse.swt.graphics.Resource;
@@ -464,8 +465,13 @@ private Rectangle getOverlayBounds() {
 		Rectangle bounds = null;
 		for (Rectangle fr : frames) {
 			if (fr.width > 6) {
-				Rectangle outerBounds = new Rectangle(fr.x - 3, fr.y - 3, fr.width + 6,
-						fr.height + 6);
+				Rectangle outerBounds;
+				if (fr instanceof MonitorAwareRectangle monitorAwareFr) {
+					outerBounds = new MonitorAwareRectangle(fr.x - 3, fr.y - 3, fr.width + 6, fr.height + 6,
+							monitorAwareFr.getMonitor());
+				} else {
+					outerBounds = new Rectangle(fr.x - 3, fr.y - 3, fr.width + 6, fr.height + 6);
+				}
 				if (bounds == null) {
 					bounds = outerBounds;
 				}