[Bf-blender-cvs] [d8d20e0e59c] master: UI: include 'drag-' prefix in the short-cut text for menu items
Campbell Barton
noreply at git.blender.org
Wed Jan 11 09:28:27 CET 2023
Commit: d8d20e0e59c9856c6ba47ce9c9f0c843d32f48c4
Author: Campbell Barton
Date: Wed Jan 11 17:54:12 2023 +1100
Branches: master
https://developer.blender.org/rBd8d20e0e59c9856c6ba47ce9c9f0c843d32f48c4
UI: include 'drag-' prefix in the short-cut text for menu items
This was already done for double-click events but not drag events.
===================================================================
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/windowmanager/intern/wm_keymap.c
===================================================================
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index af0bb721f60..6e5bb593d22 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -390,11 +390,14 @@ typedef struct wmKeyMapItem {
short propvalue;
/* event */
- /** Event code itself. */
+ /** Event code itself (#EVT_LEFTCTRLKEY, #LEFTMOUSE etc). */
short type;
- /** KM_ANY, KM_PRESS, KM_NOTHING etc. */
+ /** Button state (#KM_ANY, #KM_PRESS, #KM_DBL_CLICK, #KM_CLICK_DRAG, #KM_NOTHING etc). */
int8_t val;
- /** Use when `val == KM_CLICK_DRAG`. */
+ /**
+ * The 2D direction of the event to use when `val == KM_CLICK_DRAG`.
+ * Set to #KM_DIRECTION_N, #KM_DIRECTION_S & related values, #KM_NOTHING for any direction.
+ */
int8_t direction;
/** `oskey` also known as apple, windows-key or super. */
short shift, ctrl, alt, oskey;
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 0ea878cec3b..39cf1e6d202 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -1197,6 +1197,9 @@ int WM_keymap_item_raw_to_string(const short shift,
if (val == KM_DBL_CLICK) {
p += BLI_strcpy_rlen(p, IFACE_("dbl-"));
}
+ else if (val == KM_CLICK_DRAG) {
+ p += BLI_strcpy_rlen(p, IFACE_("drag-"));
+ }
p += BLI_strcpy_rlen(p, WM_key_event_string(type, compact));
}
More information about the Bf-blender-cvs
mailing list