diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-07-30 14:14:50 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-07-30 14:14:50 +0400 |
| commit | 681b26a48ef5f83c2f0941707324b76d57c77f68 (patch) | |
| tree | d42f194c3f47425c59997891ce6a464a588613b1 | |
| parent | f66ec41b6a3b74f079c19494357c268e1ab39e85 (diff) | |
Bugfix #28109
Old issue with OSX Cocoa code: shift+scrollwheel should send
a 'horizontal wheel' event to Blender. Blender only recognizes
scroll events in general though. The old code then just didn't
send an event at all, not passing on shift+scrolls.
Now the scroll event is sent anyway, relying on Blender's
keymapping to define what to do with shift+scroll.
This fixes things like shift+scroll to scale ListBox widgets.
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index bb3d6e3aee3..5c88523d406 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1560,6 +1560,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) GHOST_TInt32 delta; double deltaF = [event deltaY]; + + if (deltaF == 0.0) deltaF = [event deltaX]; // make blender decide if it's horizontal scroll if (deltaF == 0.0) break; //discard trackpad delta=0 events delta = deltaF > 0.0 ? 1 : -1; |