[Jmol-commits] SF.net SVN: jmol: [5187] branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java

[<ha...@us...>]

Revision: 5187
Author:   hansonr
Date:     2006-05-28 08:30:21 -0700 (Sun, 28 May 2006)
ViewCVS:  http://svn.sourceforge.net/jmol/?rev=5187&view=rev

Log Message:
-----------
bob200603 fixing cross-over problem of zoom/rotate with shift-left key

Modified Paths:
--------------
    branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java	2006-05-28 14:14:39 UTC (rev 5186)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java	2006-05-28 15:30:21 UTC (rev 5187)
@@ -305,8 +305,11 @@
     case SHIFT_LEFT:
     case ALT_LEFT:
     case MIDDLE:
-      viewer.zoomBy(deltaY);
-      // fall into
+      if (deltaY < 0 && deltaX > deltaY || deltaY > 0 && deltaX < deltaY)
+        viewer.zoomBy(deltaY);
+      if (deltaX < 0 && deltaY > deltaX || deltaX > 0 && deltaY < deltaX)
+        viewer.rotateZBy(-deltaX);
+      break;
     case SHIFT_RIGHT: // the one-button Mac folks won't get this gesture
       viewer.rotateZBy(-deltaX);
       break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.