[Bf-blender-cvs] [de12cd7] master: Fix T41426: floating menus - scroll issues.

Bastien Montagne noreply at git.blender.org
Mon Aug 18 14:17:05 CEST 2014


Commit: de12cd706f1f9f12f675dfc118ae68b2c0701d82
Author: Bastien Montagne
Date:   Mon Aug 18 14:12:55 2014 +0200
Branches: master
https://developer.blender.org/rBde12cd706f1f9f12f675dfc118ae68b2c0701d82

Fix T41426: floating menus - scroll issues.

Do not reset active but if cursor is not over it when getting mousewheel events.

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index ac4da00..166090c 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7951,7 +7951,7 @@ static int ui_handle_menu_button(bContext *C, const wmEvent *event, uiPopupBlock
 		else if (!ui_mouse_inside_region(but->active->region, event->x, event->y)) {
 			/* pass, needed to click-exit outside of non-flaoting menus */
 		}
-		else if ((event->type != MOUSEMOVE) && ISMOUSE(event->type)) {
+		else if ((!ELEM(event->type, MOUSEMOVE, WHEELUPMOUSE, WHEELDOWNMOUSE, MOUSEPAN)) && ISMOUSE(event->type)) {
 			if (!ui_mouse_inside_button(but->active->region, but, event->x, event->y)) {
 				but = NULL;
 			}




More information about the Bf-blender-cvs mailing list