Skip to content

Commit 5f6ab88

Browse files
committed
[Gtk4] Adjust to Gtk 4 cursor names
In Gtk 4 cursor names are aligned to CSS cursor names as documented in https://docs.gtk.org/gdk4/ctor.Cursor.new_from_name.html
1 parent 37cd926 commit 5f6ab88

File tree

1 file changed

+21
-21
lines changed
  • bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics

1 file changed

+21
-21
lines changed

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Cursor.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -114,28 +114,28 @@ public Cursor(Device device, int style) {
114114
super(device);
115115
String name1 = null, name2 = null;
116116
switch (style) {
117-
case SWT.CURSOR_APPSTARTING: name1 = "left_ptr_watch"; break;
118-
case SWT.CURSOR_ARROW: name1 = "left_ptr"; break;
119-
case SWT.CURSOR_WAIT: name1 = "watch"; break;
117+
case SWT.CURSOR_APPSTARTING: name1 = GTK.GTK4 ? "progress" :"left_ptr_watch"; break;
118+
case SWT.CURSOR_ARROW: name1 = GTK.GTK4 ? "default" : "left_ptr"; break;
119+
case SWT.CURSOR_WAIT: name1 = GTK.GTK4 ? "wait" :"watch"; break;
120120
case SWT.CURSOR_CROSS: name1 = "crosshair"; break;
121-
case SWT.CURSOR_HAND: name1 = "hand2"; break;
122-
case SWT.CURSOR_HELP: name1 = "question_arrow"; break;
123-
case SWT.CURSOR_SIZEALL: name1 = "fleur"; break;
124-
case SWT.CURSOR_SIZENESW: name1 = "size_bdiag"; break;
125-
case SWT.CURSOR_SIZENS: name1 = "sb_v_double_arrow"; break;
126-
case SWT.CURSOR_SIZENWSE: name1 = "size_fdiag"; break;
127-
case SWT.CURSOR_SIZEWE: name1 = "sb_h_double_arrow"; break;
128-
case SWT.CURSOR_SIZEN: name1 = "top_side"; break;
129-
case SWT.CURSOR_SIZES: name1 = "bottom_side"; break;
130-
case SWT.CURSOR_SIZEE: name1 = "right_side"; break;
131-
case SWT.CURSOR_SIZEW: name1 = "left_side"; break;
132-
case SWT.CURSOR_SIZENE: name1 = "top_right_corner"; break;
133-
case SWT.CURSOR_SIZESE: name1 = "bottom_right_corner"; break;
134-
case SWT.CURSOR_SIZESW: name1 = "bottom_left_corner"; break;
135-
case SWT.CURSOR_SIZENW: name1 = "top_left_corner"; break;
136-
case SWT.CURSOR_UPARROW: name1 = "sb_up_arrow"; name2 = "up-arrow"; break;
137-
case SWT.CURSOR_IBEAM: name1 = "xterm"; break;
138-
case SWT.CURSOR_NO: name1 = "crossed_circle"; name2 = "not-allowed"; break;
121+
case SWT.CURSOR_HAND: name1 = GTK.GTK4 ? "pointer" :"hand2"; break;
122+
case SWT.CURSOR_HELP: name1 = GTK.GTK4 ? "help" :"question_arrow"; break;
123+
case SWT.CURSOR_SIZEALL: name1 = GTK.GTK4 ? "move" : "fleur"; break;
124+
case SWT.CURSOR_SIZENESW: name1 = GTK.GTK4 ? "nesw-resize" : "size_bdiag"; break;
125+
case SWT.CURSOR_SIZENS: name1 = GTK.GTK4 ? "ns-resize" : "sb_v_double_arrow"; break;
126+
case SWT.CURSOR_SIZENWSE: name1 = GTK.GTK4 ? "nwse-resize" :"size_fdiag"; break;
127+
case SWT.CURSOR_SIZEWE: name1 = GTK.GTK4 ? "ew-resize" :"sb_h_double_arrow"; break;
128+
case SWT.CURSOR_SIZEN: name1 = GTK.GTK4 ? "n-resize" :"top_side"; break;
129+
case SWT.CURSOR_SIZES: name1 = GTK.GTK4 ? "s-resize" :"bottom_side"; break;
130+
case SWT.CURSOR_SIZEE: name1 = GTK.GTK4 ? "e-resize" :"right_side"; break;
131+
case SWT.CURSOR_SIZEW: name1 = GTK.GTK4 ? "w-resize" :"left_side"; break;
132+
case SWT.CURSOR_SIZENE: name1 = GTK.GTK4 ? "ne-resize" :"top_right_corner"; break;
133+
case SWT.CURSOR_SIZESE: name1 = GTK.GTK4 ? "se-resize" :"bottom_right_corner"; break;
134+
case SWT.CURSOR_SIZESW: name1 = GTK.GTK4 ? "sw-resize" :"bottom_left_corner"; break;
135+
case SWT.CURSOR_SIZENW: name1 = GTK.GTK4 ? "nw-resize" :"top_left_corner"; break;
136+
case SWT.CURSOR_UPARROW: name1 = GTK.GTK4 ? "default" : "sb_up_arrow"; name2 = "up-arrow"; break;
137+
case SWT.CURSOR_IBEAM: name1 = GTK.GTK4 ? "text" :"xterm"; break;
138+
case SWT.CURSOR_NO: name1 = GTK.GTK4 ? "not-allowed" :"crossed_circle"; name2 = "not-allowed"; break;
139139
default:
140140
SWT.error(SWT.ERROR_INVALID_ARGUMENT);
141141
}

0 commit comments

Comments
 (0)