[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24367] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix bug #19754: alt + scrollwheel to change button values was not

[Brecht Van Lommel]

Revision: 24367
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24367
Author:   blendix
Date:     2009-11-05 21:32:46 +0100 (Thu, 05 Nov 2009)

Log Message:
-----------
Fix bug #19754: alt + scrollwheel to change button values was not
working in popup menus, silly workaround now until this uses modal
keymaps.

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	2009-11-05 19:32:10 UTC (rev 24366)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2009-11-05 20:32:46 UTC (rev 24367)
@@ -4578,7 +4578,8 @@
 				case WHEELUPMOUSE:
 				case WHEELDOWNMOUSE:
 					/* arrowkeys: only handle for block_loop blocks */
-					if(inside || (block->flag & UI_BLOCK_LOOP)) {
+					if(event->alt || event->shift || event->ctrl || event->oskey);
+					else if(inside || (block->flag & UI_BLOCK_LOOP)) {
 						if(event->val==KM_PRESS) {
 							but= ui_but_find_activated(ar);
 							if(but) {
@@ -4601,9 +4602,10 @@
 									ui_handle_button_activate(C, ar, bt, BUTTON_ACTIVATE);
 							}
 						}
+
+						retval= WM_UI_HANDLER_BREAK;
 					}
 
-					retval= WM_UI_HANDLER_BREAK;
 					break;
 
 				case ONEKEY: 	case PAD1: 
@@ -4650,9 +4652,10 @@
 								break;
 							}
 						}
+
+						retval= WM_UI_HANDLER_BREAK;
 					}
 
-					retval= WM_UI_HANDLER_BREAK;
 					break;
 			}
 		}