[Bf-blender-cvs] [8f8e91987b5] master: Fix tool-tips remaining after operators start
Campbell Barton
noreply at git.blender.org
Wed Aug 7 12:37:43 CEST 2019
Commit: 8f8e91987b53a6ea07a3b94f7dc7689df8677600
Author: Campbell Barton
Date: Wed Aug 7 20:31:55 2019 +1000
Branches: master
https://developer.blender.org/rB8f8e91987b53a6ea07a3b94f7dc7689df8677600
Fix tool-tips remaining after operators start
It was possible for e.g. to have a header tooltip displayed,
then start walk-navigation which didn't close the tool-tip.
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index cea2f127b3e..88a4c13c4ca 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2691,6 +2691,12 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
wmKeyMap *keymap = WM_event_get_keymap_from_handler(wm, handler);
action |= wm_handlers_do_keymap_with_keymap_handler(
C, event, handlers, handler, keymap, do_debug_handler);
+
+ /* Clear the tool-tip whenever a key binding is handled, without this tool-tips
+ * are kept when a modal operators starts (annoying but otherwise harmless). */
+ if (action & WM_HANDLER_BREAK) {
+ WM_tooltip_clear(C, CTX_wm_window(C));
+ }
}
else if (handler_base->type == WM_HANDLER_TYPE_UI) {
wmEventHandler_UI *handler = (wmEventHandler_UI *)handler_base;
More information about the Bf-blender-cvs
mailing list