[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28780] trunk/blender/source/blender/ editors/interface/interface_handlers.c: FIX: Enter didn' t work in filebrowser when mouse inside icon or preview

[Andrea Weikert]

Revision: 28780
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28780
Author:   elubie
Date:     2010-05-15 13:52:59 +0200 (Sat, 15 May 2010)

Log Message:
-----------
FIX: Enter didn't work in filebrowser when mouse inside icon or preview

Note: This is yet another problem that results from the fact that the icon/preview in file browser is now a button rather than just drawn as an image. (Similar to LEFMOUSE not working in filebrowser). This should be checked on as the fix might cause issues in the future when using image drag buttons in other parts of Blender.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-05-15 10:37:21 UTC (rev 28779)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-05-15 11:52:59 UTC (rev 28780)
@@ -2119,8 +2119,13 @@
 		}
 		
 		if(ELEM3(event->type, LEFTMOUSE, PADENTER, RETKEY) && event->val==KM_PRESS) {
+			int ret = WM_UI_HANDLER_BREAK;
+			/* XXX (a bit ugly) Special case handling for filebrowser drag button */
+			if(but->dragpoin && but->imb && ui_but_mouse_inside_icon(but, data->region, event)) {
+				ret = WM_UI_HANDLER_CONTINUE;
+			}
 			button_activate_state(C, but, BUTTON_STATE_EXIT);
-			return WM_UI_HANDLER_BREAK;
+			return ret;
 		}
 	}
 	else if(data->state == BUTTON_STATE_WAIT_DRAG) {