From 3d54abf60697ddb55ab420cb92b40a372af5f8b8 Mon Sep 17 00:00:00 2001 From: GeneralProtectionFault Date: Sat, 8 Aug 2026 00:33:08 -0400 Subject: [PATCH] Fix incorrectly mapped move & drag icons --- editor/scene/canvas_item_editor_plugin.cpp | 4 +-- platform/linuxbsd/wayland/wayland_thread.cpp | 4 +-- platform/linuxbsd/wayland/wayland_thread.h | 2 +- platform/linuxbsd/x11/display_server_x11.cpp | 36 ++++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp index ff8df60dd4e..07a74e11e57 100644 --- a/editor/scene/canvas_item_editor_plugin.cpp +++ b/editor/scene/canvas_item_editor_plugin.cpp @@ -2851,7 +2851,7 @@ void CanvasItemEditor::_update_cursor() { break; } if (pan_pressed) { - c = CURSOR_DRAG; + c = CURSOR_CAN_DROP; } set_default_cursor_shape(c); } @@ -2966,7 +2966,7 @@ Control::CursorShape CanvasItemEditor::get_cursor_shape(const Point2 &p_pos) con } if (pan_pressed) { - c = CURSOR_DRAG; + c = CURSOR_CAN_DROP; } return c; } diff --git a/platform/linuxbsd/wayland/wayland_thread.cpp b/platform/linuxbsd/wayland/wayland_thread.cpp index c53c49d254e..d0b40832e9d 100644 --- a/platform/linuxbsd/wayland/wayland_thread.cpp +++ b/platform/linuxbsd/wayland/wayland_thread.cpp @@ -345,14 +345,14 @@ bool WaylandThread::_load_cursor_theme(int p_cursor_size) { "cross", "watch", "left_ptr_watch", - "fleur", + "grab", "dnd-move", "crossed_circle", "v_double_arrow", "h_double_arrow", "size_bdiag", "size_fdiag", - "move", + "fleur", "row_resize", "col_resize", "question_arrow" diff --git a/platform/linuxbsd/wayland/wayland_thread.h b/platform/linuxbsd/wayland/wayland_thread.h index 70bf48280cc..d9c08fb0ceb 100644 --- a/platform/linuxbsd/wayland/wayland_thread.h +++ b/platform/linuxbsd/wayland/wayland_thread.h @@ -575,7 +575,7 @@ class WaylandThread { wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_EW_RESIZE, ///< CURSOR_HSIZE wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NESW_RESIZE, ///< CURSOR_BDIAGSIZE wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_NWSE_RESIZE, ///< CURSOR_FDIAGSIZE - wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_MOVE, ///< CURSOR_MOVE + wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_ALL_SCROLL, ///< CURSOR_MOVE wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_ROW_RESIZE, ///< CURSOR_VSPLIT wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_COL_RESIZE, ///< CURSOR_HSPLIT wp_cursor_shape_device_v1_shape::WP_CURSOR_SHAPE_DEVICE_V1_SHAPE_HELP, ///< CURSOR_HELP diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 49ba5a5774a..e14113400bb 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -7301,23 +7301,23 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode for (int i = 0; i < CURSOR_MAX; i++) { static const char *cursor_file[] = { - "left_ptr", - "xterm", - "hand2", - "cross", - "watch", - "left_ptr_watch", - "fleur", - "dnd-move", - "crossed_circle", - "v_double_arrow", - "h_double_arrow", - "size_bdiag", - "size_fdiag", - "move", - "row_resize", - "col_resize", - "question_arrow" + "left_ptr", // CURSOR_ARROW + "xterm", // CURSOR_IBEAM + "hand2", // CURSOR_POINTING_HAND + "cross", // CURSOR_CROSS + "watch", // CURSOR_WAIT + "left_ptr_watch", // CURSOR_BUSY + "grab", // CURSOR_DRAG + "dnd-move", // CURSOR_CAN_DROP + "crossed_circle", // CURSOR_FORBIDDEN + "v_double_arrow", // CURSOR_VSIZE + "h_double_arrow", // CURSOR_HSIZE + "size_bdiag", // CURSOR_BDIAGSIZE + "size_fdiag", // CURSOR_FDIAGSIZE + "fleur", // CURSOR_MOVE + "row_resize", // CURSOR_VSPLIT + "col_resize", // CURSOR_HSPLIT + "question_arrow" // CURSOR_HELP }; cursor_img[i] = XcursorLibraryLoadImage(cursor_file[i], cursor_theme, cursor_size); @@ -7359,7 +7359,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode fallback = "bd_double_arrow"; break; case CURSOR_MOVE: - cursor_img[i] = cursor_img[CURSOR_DRAG]; + fallback = "fleur"; break; case CURSOR_VSPLIT: fallback = "sb_v_double_arrow";