[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38848] trunk/blender/intern/ghost/intern/ GHOST_SystemCocoa.mm: Bugfix #28109

Ton Roosendaal ton at blender.org
Sat Jul 30 12:14:51 CEST 2011


Revision: 38848
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38848
Author:   ton
Date:     2011-07-30 10:14:50 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2011-07-30 09:24:10 UTC (rev 38847)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2011-07-30 10:14:50 UTC (rev 38848)
@@ -1560,6 +1560,8 @@
 					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;




More information about the Bf-blender-cvs mailing list