[Bf-blender-cvs] [bb8953ab498] master: GHOST/Wayland: map additional cursors from GHOST_TStandardCursor
Campbell Barton
noreply at git.blender.org
Fri Jul 1 10:11:41 CEST 2022
Commit: bb8953ab49817a6ddaaef21ac0da3a2cdc81e23f
Author: Campbell Barton
Date: Fri Jul 1 18:09:47 2022 +1000
Branches: master
https://developer.blender.org/rBbb8953ab49817a6ddaaef21ac0da3a2cdc81e23f
GHOST/Wayland: map additional cursors from GHOST_TStandardCursor
===================================================================
M intern/ghost/intern/GHOST_SystemWayland.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index d00c8b34ed7..09784c67fda 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -669,7 +669,7 @@ static const std::unordered_map<GHOST_TStandardCursor, const char *> cursors = {
{GHOST_kStandardCursorRightArrow, "right_ptr"},
{GHOST_kStandardCursorLeftArrow, "left_ptr"},
{GHOST_kStandardCursorInfo, ""},
- {GHOST_kStandardCursorDestroy, ""},
+ {GHOST_kStandardCursorDestroy, "pirate"},
{GHOST_kStandardCursorHelp, "question_arrow"},
{GHOST_kStandardCursorWait, "watch"},
{GHOST_kStandardCursorText, "xterm"},
@@ -677,21 +677,21 @@ static const std::unordered_map<GHOST_TStandardCursor, const char *> cursors = {
{GHOST_kStandardCursorCrosshairA, ""},
{GHOST_kStandardCursorCrosshairB, ""},
{GHOST_kStandardCursorCrosshairC, ""},
- {GHOST_kStandardCursorPencil, ""},
+ {GHOST_kStandardCursorPencil, "pencil"},
{GHOST_kStandardCursorUpArrow, "sb_up_arrow"},
{GHOST_kStandardCursorDownArrow, "sb_down_arrow"},
- {GHOST_kStandardCursorVerticalSplit, ""},
- {GHOST_kStandardCursorHorizontalSplit, ""},
+ {GHOST_kStandardCursorVerticalSplit, "split_v"},
+ {GHOST_kStandardCursorHorizontalSplit, "split_h"},
{GHOST_kStandardCursorEraser, ""},
{GHOST_kStandardCursorKnife, ""},
- {GHOST_kStandardCursorEyedropper, ""},
- {GHOST_kStandardCursorZoomIn, ""},
- {GHOST_kStandardCursorZoomOut, ""},
+ {GHOST_kStandardCursorEyedropper, "color-picker"},
+ {GHOST_kStandardCursorZoomIn, "zoom-in"},
+ {GHOST_kStandardCursorZoomOut, "zoom-out"},
{GHOST_kStandardCursorMove, "move"},
- {GHOST_kStandardCursorNSEWScroll, ""},
- {GHOST_kStandardCursorNSScroll, ""},
- {GHOST_kStandardCursorEWScroll, ""},
- {GHOST_kStandardCursorStop, ""},
+ {GHOST_kStandardCursorNSEWScroll, "size_all"}, /* Not an exact match. */
+ {GHOST_kStandardCursorNSScroll, "size_ver"}, /* Not an exact match. */
+ {GHOST_kStandardCursorEWScroll, "size_hor"}, /* Not an exact match. */
+ {GHOST_kStandardCursorStop, "not-allowed"},
{GHOST_kStandardCursorUpDown, "sb_v_double_arrow"},
{GHOST_kStandardCursorLeftRight, "sb_h_double_arrow"},
{GHOST_kStandardCursorTopSide, "top_side"},
More information about the Bf-blender-cvs
mailing list