diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-05-03 09:17:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-05-03 09:17:14 +0300 |
| commit | 1fb17fcf230d973f76421ab40f5ffa38f99355e7 (patch) | |
| tree | 308bb9ad4036a78985301e1454b436c14af6a894 /source/blender/editors/interface/interface_handlers.c | |
| parent | e2a6fb1f0b8efd21a2df7de48312b0b3fed616f0 (diff) | |
UI: limit listview arrow/wheel bindings
Allow Ctrl-Up for eg to be used when in a list view.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index a19d0bbfe4f..ce264051609 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; |