From 829561c03cce4d2bfab18bba4e7e7b5351addcd3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 24 Jun 2019 17:05:22 +1000 Subject: Fix T66071: Navigation tooltip shows outside of 3D view Clear gizmo highlight when the cursor leaves the region. --- source/blender/windowmanager/gizmo/WM_gizmo_api.h | 2 +- source/blender/windowmanager/gizmo/intern/wm_gizmo.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h index 9b0936b47d1..5bf18a01af5 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h @@ -67,7 +67,7 @@ void WM_gizmo_unlink(ListBase *gizmolist, bool WM_gizmo_select_unlink(struct wmGizmoMap *gzmap, struct wmGizmo *gz); bool WM_gizmo_select_set(struct wmGizmoMap *gzmap, struct wmGizmo *gz, bool select); -void WM_gizmo_highlight_set(struct wmGizmoMap *gzmap, struct wmGizmo *gz); +bool WM_gizmo_highlight_set(struct wmGizmoMap *gzmap, struct wmGizmo *gz); void WM_gizmo_modal_set_from_setup(struct wmGizmoMap *gzmap, struct bContext *C, diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c index b05865aa7bb..8eefea84ff8 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c @@ -443,9 +443,9 @@ bool WM_gizmo_select_set(wmGizmoMap *gzmap, wmGizmo *gz, bool select) return wm_gizmo_select_set_ex(gzmap, gz, select, true, true); } -void WM_gizmo_highlight_set(wmGizmoMap *gzmap, wmGizmo *gz) +bool WM_gizmo_highlight_set(wmGizmoMap *gzmap, wmGizmo *gz) { - wm_gizmomap_highlight_set(gzmap, NULL, gz, gz ? gz->highlight_part : 0); + return wm_gizmomap_highlight_set(gzmap, NULL, gz, gz ? gz->highlight_part : 0); } bool wm_gizmo_select_and_highlight(bContext *C, wmGizmoMap *gzmap, wmGizmo *gz) -- cgit v1.2.3