diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-27 19:14:31 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-27 19:41:59 +0300 |
commit | 08dff7b40bc6a93b4826f6abf8bdc2b9a8bae12e (patch) | |
tree | ac9b0c79c0d0b352822287627e2e80c3b2b88f8f /source/blender/editors/interface/interface_region_tooltip.c | |
parent | d83d376c02412b14dd16493ea09ac77a27a9ca30 (diff) |
Gizmo: add per gizmo keymaps
Remove click-drag support for tweak gizmo,
rely on keymap events instead.
This is needed for some gizmos to use modifiers keys
without having all gizmos use all modifier keys (see: T63996).
Diffstat (limited to 'source/blender/editors/interface/interface_region_tooltip.c')
-rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 5b205de21b8..c47f35c8edd 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -883,20 +883,25 @@ static uiTooltipData *ui_tooltip_data_from_gizmo(bContext *C, wmGizmo *gz) /* Operator Actions */ { - bool use_drag = gz->drag_part != -1 && gz->highlight_part != gz->drag_part; - const struct { int part; const char *prefix; } gzop_actions[] = { - { - .part = gz->highlight_part, - .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Click") : NULL, - }, - { - .part = use_drag ? gz->drag_part : -1, - .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Drag") : NULL, - }, +#if 0 + { + .part = gz->highlight_part, + .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Click") : NULL, + }, + { + .part = use_drag ? gz->drag_part : -1, + .prefix = use_drag ? CTX_TIP_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Drag") : NULL, + }, +#else + { + .part = gz->highlight_part, + .prefix = NULL, + }, +#endif }; for (int i = 0; i < ARRAY_SIZE(gzop_actions); i++) { |