From 99dbb4b4d4177fb234ec6396b20a92d4ddcf64d7 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler <ziegler.patrick@hotmail.de>
Date: Mon, 4 May 2026 21:58:11 +0200
Subject: [PATCH] [Draw2D] Migrate to Draw2D Figure for AbstractGridHelper

Note that the grid is drawn relative to the top-left corner of the
container, hence why the `Figure` needs to use relative coordinates.
---
 .../gef/policy/layout/grid/AbstractGridHelper.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java
index 36c17db42..7bffdc7eb 100644
--- a/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java
+++ b/org.eclipse.wb.core/src/org/eclipse/wb/core/gef/policy/layout/grid/AbstractGridHelper.java
@@ -15,7 +15,6 @@
 import org.eclipse.wb.core.gef.policy.PolicyUtils;
 import org.eclipse.wb.core.model.IAbstractComponentInfo;
 import org.eclipse.wb.core.model.ObjectInfo;
-import org.eclipse.wb.draw2d.Figure;
 import org.eclipse.wb.draw2d.FigureUtils;
 import org.eclipse.wb.gef.core.IEditPartViewer;
 import org.eclipse.wb.gef.graphical.policies.LayoutEditPolicy;
@@ -24,6 +23,7 @@
 import org.eclipse.wb.internal.core.utils.ui.DrawUtils;
 
 import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.FigureListener;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Polyline;
@@ -160,7 +160,13 @@ public final void showGridFeedback() {
 			return;
 		}
 		// create grid figure
-		m_gridFigure = new Figure();
+		m_gridFigure = new Figure() {
+			// Grid is drawn relative to the top-left corner of the container
+			@Override
+			protected boolean useLocalCoordinates() {
+				return true;
+			}
+		};
 		// install listener on root model figure
 		{
 			ObjectInfo rootObjectInfo = ((ObjectInfo) getHost().getModel()).getRoot();