[Bf-blender-cvs] [90b9f02] wiggly-widgets: Always activate widget when starting to drag (not only if handling is available)

Julian Eisel noreply at git.blender.org
Sun Feb 7 22:42:34 CET 2016


Commit: 90b9f0262c2f7d20e31d4eed05f292afbdd8a437
Author: Julian Eisel
Date:   Sun Feb 7 14:33:36 2016 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB90b9f0262c2f7d20e31d4eed05f292afbdd8a437

Always activate widget when starting to drag (not only if handling is available)

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

M	source/blender/windowmanager/intern/wm_widgets.c

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

diff --git a/source/blender/windowmanager/intern/wm_widgets.c b/source/blender/windowmanager/intern/wm_widgets.c
index 7edb2ca..8d4750e 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -1299,16 +1299,17 @@ void wm_widgetmap_set_active_widget(
         const wmEvent *event, wmWidget *widget)
 {
 	if (widget) {
+		widget->flag |= WM_WIDGET_ACTIVE;
+		wmap->wmap_context.active_widget = widget;
+
 		if (widget->opname) {
 			wmOperatorType *ot = WM_operatortype_find(widget->opname, 0);
 
 			if (ot) {
 				/* first activate the widget itself */
 				if (widget->invoke && widget->handler) {
-					widget->flag |= WM_WIDGET_ACTIVE;
 					widget->invoke(C, event, widget);
 				}
-				wmap->wmap_context.active_widget = widget;
 
 				WM_operator_name_call_ptr(C, ot, WM_OP_INVOKE_DEFAULT, &widget->opptr);
 
@@ -1331,9 +1332,7 @@ void wm_widgetmap_set_active_widget(
 		}
 		else {
 			if (widget->invoke && widget->handler) {
-				widget->flag |= WM_WIDGET_ACTIVE;
 				widget->invoke(C, event, widget);
-				wmap->wmap_context.active_widget = widget;
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list