From 8b0e211c957d97cc2ad09408d32f9459bb97c1d2 Mon Sep 17 00:00:00 2001 From: Patrick Ziegler Date: Sat, 12 Sep 2026 12:01:39 +0200 Subject: [PATCH] [GEF] Use Draw2D cursors for CreationTool This makes the cursor look the same when mixing Draw2D and GEF tools. --- .../gef/core/tools/AbstractCreationTool.java | 7 +- .../gef/core/tools/DragEditPartTracker.java | 4 +- .../wb/internal/gef/core/SharedCursors.java | 6 +- .../wb/internal/gef/core/icons/add_cursor.png | Bin 766 -> 0 bytes .../wb/internal/gef/core/icons/add_cursor.svg | 67 ----------------- .../wb/internal/gef/core/icons/no_cursor.png | Bin 896 -> 0 bytes .../wb/internal/gef/core/icons/no_cursor.svg | 70 ------------------ .../wb/tests/gef/CreationToolCursorTest.java | 7 +- 8 files changed, 15 insertions(+), 146 deletions(-) delete mode 100644 org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.png delete mode 100644 org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.svg delete mode 100644 org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.png delete mode 100644 org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java index e43f27d3f1..a344041b9a 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java @@ -13,10 +13,11 @@ package org.eclipse.wb.gef.core.tools; import org.eclipse.wb.gef.core.requests.AbstractCreateRequest; -import org.eclipse.wb.internal.gef.core.SharedCursors; +import org.eclipse.draw2d.Cursors; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.Request; +import org.eclipse.gef.SharedCursors; import org.eclipse.gef.tools.TargetingTool; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; @@ -32,8 +33,8 @@ public abstract class AbstractCreationTool extends TargetingTool { // //////////////////////////////////////////////////////////////////////////// public AbstractCreationTool() { - setDefaultCursor(SharedCursors.CURSOR_ADD); - setDisabledCursor(SharedCursors.CURSOR_NO); + setDefaultCursor(SharedCursors.CURSOR_TREE_ADD); + setDisabledCursor(Cursors.NO); } //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java index f2c63fad4a..e723f5a96a 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java @@ -16,6 +16,7 @@ import org.eclipse.wb.internal.gef.core.IObjectInfoEditPart; import org.eclipse.wb.internal.gef.core.SharedCursors; +import org.eclipse.draw2d.Cursors; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.EditPart; @@ -50,10 +51,11 @@ public class DragEditPartTracker extends SelectEditPartTracker { // Constructor // //////////////////////////////////////////////////////////////////////////// + @SuppressWarnings("deprecation") public DragEditPartTracker(EditPart sourceEditPart) { super(sourceEditPart); setDefaultCursor(SharedCursors.CURSOR_MOVE); - setDisabledCursor(SharedCursors.CURSOR_NO); + setDisabledCursor(Cursors.NO); } //////////////////////////////////////////////////////////////////////////// diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java index 4c7989c8df..b0d3afa5de 100644 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java +++ b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java @@ -51,9 +51,11 @@ public class SharedCursors extends Cursors { return CURSOR_AT_200_ZOOM.getImageData(100); }); - public static final Cursor CURSOR_ADD = createCursor("icons/add_cursor.svg"); + /** + * TODO gef - Remove together with DragEditPartTracker + */ + @Deprecated public static final Cursor CURSOR_MOVE = createCursor("icons/move_cursor.svg"); - public static final Cursor CURSOR_NO = createCursor("icons/no_cursor.svg"); private static Cursor createCursor(String sourceName) { if (DesignerPlugin.isSvgSupported()) { diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.png b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.png deleted file mode 100644 index f43a2fde3508f3277cc6ddbb791d8422231b7688..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmZ{gdq`6O6vjW@D>v_T&PO7pCe24nyG}7360hxsbdVGHgMOmsc=r zv9XV7&1)2i8F4S`CMJ*BFCCLOOXOH=)HAnPBxk6@OWBOJZ0_yZFQzO*kau zwsikU@0?NVHG%=lierT?xl|L! zUba~6tGgeXL_wJgCVDTvW@{bguEH-u&8jzZu~@In(rfeeI$7Zv9V3uZ(%1+pIzk$g z5fv|sijz^X5{i;hRHZmn@E1^eT3cLn?*9O - - - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.png b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.png deleted file mode 100644 index a675bedab610dbc223145b75d7605321d9e50fc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmZ{geN2;A6vl5`3EGV*R*Uj2&B}?|lPIAu4bMO7# zC+E2HH92AYXg(n%Or>PBY>!{c3sf=-7Ue=U6WAm9wxjO%Ml~i+VrCeZoN(<7 z=EgibT#ET?xYLKrE{xdGTa9Ce#RIxOa$gEsmH63@TRu!4!mu5uO>h^XUU^q4n0;>_ z#*Se66#OnswBlkD&RKABFOHO;tq}HY@a&!|*zi?b?K8U;HwST{3FjMe&W1BpXxV{U zC8{^WZ45TQwNNg@L^sZwVP^1-d@ftCP$I(M0rVK)Eko5Nye(N|KRMonL$AZL3!XP{ za3`Evu(Q~dD3`)O&$?}k`*ql#kLK;DQ^CTZQVOH!?v}XETWoVVF=)txMFI0x?3F{G zKF>tMoQ=wjD9?mZjMB94H%5Oa3V&3XJd+;rrPK1LzUX?hB^aE3ja?m*<3iwy?<$|!HtiuLiQxc%fZ z|1ftv+0UOJa3uN9a6cfU{2uO!myoSR`+BpM?M z#kMfD&=j*LD}^5nd%nZqQ8Tu@=_z5#NYd~}ks~dP??ay}D>CGTPR)%~A*n+}5g(5= z);HLnK7QhT8d`iYfx4C@xtb}ON|awop!vr$PwQv(fvLb>f|P`j8M4f+`t|zyfr`in zk{@4;qG_Qc{<-(%ysfpJ6HS^_-U>nzUy1wLyXMwyc0q|&MUmA|Vl~S2W+U4OP0?Z@ zB^9QLbd*$Fi@t?o3K+?Ys)(Vr+Vl6S%EHN2E gDqTp6bZM-KR3=XU$E2?=*v&FTrO+@#TZ)~31JKlZ9{>OV diff --git a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg b/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg deleted file mode 100644 index cc552c2223..0000000000 --- a/org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java index 6c436b77f5..bf72cf0fd7 100644 --- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java +++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java @@ -14,9 +14,10 @@ import org.eclipse.wb.gef.core.tools.CreationTool; import org.eclipse.wb.gef.graphical.tools.SelectionTool; -import org.eclipse.wb.internal.gef.core.SharedCursors; +import org.eclipse.draw2d.Cursors; import org.eclipse.gef.EditPart; +import org.eclipse.gef.SharedCursors; import org.eclipse.gef.Tool; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.CreationFactory; @@ -39,11 +40,11 @@ public class CreationToolCursorTest extends GefCursorTestCase { // //////////////////////////////////////////////////////////////////////////// public static final Cursor CURSOR_ADD() { - return SharedCursors.CURSOR_ADD; + return SharedCursors.CURSOR_TREE_ADD; } public static final Cursor CURSOR_NO() { - return SharedCursors.CURSOR_NO; + return Cursors.NO; } ////////////////////////////////////////////////////////////////////////////