Skip to content

Commit 52e81e7

Browse files
ptzieglerazoitl
authored andcommitted
Revert "Cleanup GEF cursors and remove some of the blockiness"
This reverts commit 537b65f.
1 parent fd641e1 commit 52e81e7

16 files changed

+7
-9
lines changed

org.eclipse.gef/src/org/eclipse/gef/SharedCursors.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import org.eclipse.draw2d.Cursors;
2020

21-
import org.eclipse.gef.internal.InternalGEFPlugin;
2221
import org.eclipse.gef.internal.InternalImages;
2322

2423
/**
@@ -46,16 +45,15 @@ public class SharedCursors extends Cursors {
4645
public static final Cursor CURSOR_TREE_MOVE;
4746

4847
static {
49-
CURSOR_PLUG = createCursor("icons/plug-cursor.svg"); //$NON-NLS-1$
50-
CURSOR_PLUG_NOT = createCursor("icons/plugnot-cursor.svg"); //$NON-NLS-1$
51-
CURSOR_TREE_ADD = createCursor("icons/tree_add-cursor.svg"); //$NON-NLS-1$
52-
CURSOR_TREE_MOVE = createCursor("icons/tree_move-cursor.svg"); //$NON-NLS-1$
48+
CURSOR_PLUG = createCursor("icons/plug-cursor.png"); //$NON-NLS-1$
49+
CURSOR_PLUG_NOT = createCursor("icons/plugnot-cursor.png"); //$NON-NLS-1$
50+
CURSOR_TREE_ADD = createCursor("icons/tree_add-cursor.png"); //$NON-NLS-1$
51+
CURSOR_TREE_MOVE = createCursor("icons/tree_move-cursor.png"); //$NON-NLS-1$
5352
}
5453

5554
private static Cursor createCursor(String sourceName) {
5655
ImageDescriptor src = InternalImages.createDescriptor(sourceName);
57-
int deviceZoom = InternalGEFPlugin.getOrDefaultDeviceZoom();
58-
return new Cursor(null, InternalGEFPlugin.scaledImageData(src, deviceZoom), 0, 0);
56+
return new Cursor(null, src.getImageData(100), 0, 0);
5957
}
6058

6159
}

org.eclipse.gef/src/org/eclipse/gef/SharedImages.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public class SharedImages {
7373
public static final ImageDescriptor DESC_MARQUEE_TOOL_CONNECTIONS_24;
7474

7575
static {
76-
DESC_SELECTION_TOOL_16 = InternalImages.createDescriptor("icons/arrow16.svg"); //$NON-NLS-1$
77-
DESC_SELECTION_TOOL_24 = InternalImages.createDescriptor("icons/arrow24.svg"); //$NON-NLS-1$
76+
DESC_SELECTION_TOOL_16 = InternalImages.createDescriptor("icons/arrow16.gif"); //$NON-NLS-1$
77+
DESC_SELECTION_TOOL_24 = InternalImages.createDescriptor("icons/arrow24.gif"); //$NON-NLS-1$
7878
DESC_MARQUEE_TOOL_16 = InternalImages.createDescriptor("icons/marquee16.svg"); //$NON-NLS-1$
7979
DESC_MARQUEE_TOOL_24 = InternalImages.createDescriptor("icons/marquee24.svg"); //$NON-NLS-1$
8080
DESC_MARQUEE_TOOL_NODES_16 = InternalImages.createDescriptor("icons/marquee_nodes16.svg"); //$NON-NLS-1$
336 Bytes
Loading
-539 Bytes
Binary file not shown.
-976 Bytes
Binary file not shown.
139 Bytes
Loading
-708 Bytes
Binary file not shown.
-1.26 KB
Binary file not shown.
-417 Bytes
Loading
-1009 Bytes
Loading

0 commit comments

Comments
 (0)