Commit: 66263905ae8b4372e0e103679dbcb07c8fb7420f
Author: Campbell Barton
Date: Thu Jun 21 10:32:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB66263905ae8b4372e0e103679dbcb07c8fb7420f
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface_handlers.c
index c756d6ed1ef,48d9e186863..f999bbb62f3
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -9586,15 -9631,11 +9586,20 @@@ static int ui_handle_menu_event
retval = ui_handle_menu_button(C, event, menu);
}
+#ifdef USE_UI_POPOVER_ONCE
+ if (block->flag & UI_BLOCK_POPOVER_ONCE) {
+ if ((event->type == LEFTMOUSE) && (event->val == KM_RELEASE)) {
+ UI_popover_once_clear(menu->popup_create_vars.arg);
+ block->flag &= ~UI_BLOCK_POPOVER_ONCE;
+ }
+ }
+#endif
+
+ /* Don't handle double click events, rehandle as regular press/release.
*/
+ if (retval == WM_UI_HANDLER_CONTINUE && event->val == KM_DBL_CLICK) {
+ return retval;
+ }
+
/* if we set a menu return value, ensure we continue passing this on to
* lower menus and buttons, so always set continue then, and if we are
* inside the region otherwise, ensure we swallow the event */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
