Skip to content

[GEF] Use Draw2D cursors for CreationTool #1607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptziegler merged 1 commit into from
Sep 12, 2026
Merged

[GEF] Use Draw2D cursors for CreationTool #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/AbstractCreationTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

////////////////////////////////////////////////////////////////////////////
Expand Down
4 changes: 3 additions & 1 deletion org.eclipse.wb.core/src-gef/org/eclipse/wb/gef/core/tools/DragEditPartTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 4 additions & 2 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/SharedCursors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
Binary file removed org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.png
View file
Open in desktop
Binary file not shown.
67 changes: 0 additions & 67 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/add_cursor.svg
View file
Open in desktop

This file was deleted.

Binary file removed org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.png
View file
Open in desktop
Binary file not shown.
70 changes: 0 additions & 70 deletions org.eclipse.wb.core/src-gef/org/eclipse/wb/internal/gef/core/icons/no_cursor.svg
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions org.eclipse.wb.tests/src/org/eclipse/wb/tests/gef/CreationToolCursorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

////////////////////////////////////////////////////////////////////////////
Expand Down
Loading