[Bf-blender-cvs] [d49498a] master: Fix T37442: Disabled uiList would "freeze" Blender when trying to drag-resize it.

mont29 noreply at git.blender.org
Sat Nov 16 11:31:56 CET 2013


Commit: d49498a4612993b7821e62d5267e22b99f781b92
Author: mont29
Date:   Sat Nov 16 11:30:48 2013 +0100
http://developer.blender.org/rBd49498a4612993b7821e62d5267e22b99f781b92

Fix T37442: Disabled uiList would "freeze" Blender when trying to drag-resize it.

For now, simply disable drag-resize for disabled uiLists!

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

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 903a5e7..bb129c1 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6785,7 +6785,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar)
 		is_over_dragbut = true;
 	}
 
-	if (is_over_dragbut && type == LEFTMOUSE && val == KM_PRESS) {
+	if (is_over_dragbut && type == LEFTMOUSE && val == KM_PRESS && !(but->flag & UI_BUT_DISABLED)) {
 		uiHandleButtonData *data;
 		int *size = (int *)but->poin;




More information about the Bf-blender-cvs mailing list