[Bf-blender-cvs] [1fb17fc] master: UI: limit listview arrow/wheel bindings

[Campbell Barton]

Commit: 1fb17fcf230d973f76421ab40f5ffa38f99355e7
Author: Campbell Barton
Date:   Tue May 3 16:17:14 2016 +1000
Branches: master
https://developer.blender.org/rB1fb17fcf230d973f76421ab40f5ffa38f99355e7

UI: limit listview arrow/wheel bindings

Allow Ctrl-Up for eg to be used when in a list view.

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

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 a19d0bb..ce26405 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8451,8 +8451,8 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar,
 	}
 
 	if (val == KM_PRESS) {
-		if (ELEM(type, UPARROWKEY, DOWNARROWKEY) ||
-		    ((ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->ctrl)))
+		if ((ELEM(type, UPARROWKEY, DOWNARROWKEY) && !IS_EVENT_MOD(event, shift, ctrl, alt, oskey)) ||
+		    ((ELEM(type, WHEELUPMOUSE, WHEELDOWNMOUSE) && event->ctrl && !IS_EVENT_MOD(event, shift, alt, oskey))))
 		{
 			const int value_orig = RNA_property_int_get(&listbox->rnapoin, listbox->rnaprop);
 			int value, min, max, inc;