[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58546] trunk/blender/source/blender/ editors/interface/interface_handlers.c: let the enter key active text buttons and the unlink button

[Campbell Barton]

Revision: 58546
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58546
Author:   campbellbarton
Date:     2013-07-23 14:55:47 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
let the enter key active text buttons and the unlink button

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	2013-07-23 14:28:19 UTC (rev 58545)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2013-07-23 14:55:47 UTC (rev 58546)
@@ -2605,7 +2605,7 @@
 static int ui_do_but_TEX(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, const wmEvent *event)
 {
 	if (data->state == BUTTON_STATE_HIGHLIGHT) {
-		if (ELEM(event->type, LEFTMOUSE, EVT_BUT_OPEN) && event->val == KM_PRESS) {
+		if (ELEM4(event->type, LEFTMOUSE, EVT_BUT_OPEN, PADENTER, RETKEY) && event->val == KM_PRESS) {
 			if (but->dt == UI_EMBOSSN && !event->ctrl) {
 				/* pass */
 			}
@@ -2630,7 +2630,7 @@
 static int ui_do_but_SEARCH_UNLINK(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, const wmEvent *event)
 {
 	/* unlink icon is on right */
-	if (ELEM(event->type, LEFTMOUSE, EVT_BUT_OPEN) && event->val == KM_PRESS) {
+	if (ELEM4(event->type, LEFTMOUSE, EVT_BUT_OPEN, PADENTER, RETKEY) && event->val == KM_PRESS) {
 		ARegion *ar = data->region;
 		rcti rect;
 		int x = event->x, y = event->y;