From 7ed7901c00867a951bd2bb0e179d7b087cd68d9d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 27 May 2020 12:24:29 +1000 Subject: Gizmo: add flag to disable tooltip For some gizmos that follow the mouse cursor, this gets in the way. --- source/blender/windowmanager/gizmo/WM_gizmo_types.h | 3 +++ source/blender/windowmanager/intern/wm_event_system.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h index 955fb959e92..e79031193c2 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h @@ -89,6 +89,9 @@ typedef enum eWM_GizmoFlag { /** Don't pass through events to other handlers * (allows click/drag not to have it's events stolen by press events in other keymaps). */ WM_GIZMO_EVENT_HANDLE_ALL = (1 << 10), + + /** Don't use tool-tips for this gizmo (can be distracting). */ + WM_GIZMO_NO_TOOLTIP = (1 << 11), } eWM_GizmoFlag; /** diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 0da82881ba3..54498b21369 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2590,7 +2590,7 @@ static int wm_handlers_do_gizmo_handler(bContext *C, if (wm_gizmomap_highlight_set(gzmap, C, gz, part)) { if (gz != NULL) { - if (U.flag & USER_TOOLTIPS) { + if ((U.flag & USER_TOOLTIPS) && (gz->flag & WM_GIZMO_NO_TOOLTIP) == 0) { WM_tooltip_timer_init(C, CTX_wm_window(C), area, region, WM_gizmomap_tooltip_init); } } -- cgit v1.2.3