get largest scroll axis, since shift+scroll now returns X

saalfeldlab · Jan 13, 2021 · a3bc181 · a3bc181
1 parent 07f061b
commit a3bc181
Showing 1 changed file with 37 additions and 40 deletions.
diff --git a/src/main/java/org/janelia/saalfeldlab/paintera/viewer3d/Scene3DHandler.java b/src/main/java/org/janelia/saalfeldlab/paintera/viewer3d/Scene3DHandler.java
@@ -13,6 +13,7 @@
 
 import org.janelia.saalfeldlab.fx.event.MouseDragFX;
 import org.janelia.saalfeldlab.fx.util.InvokeOnJavaFXApplicationThread;
+import org.janelia.saalfeldlab.paintera.control.ControlUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,53 +87,49 @@ public void setInitialTransformToInterval(final Interval interval)
 		InvokeOnJavaFXApplicationThread.invoke(() -> this.setAffine(initialTransform));
 	}
 
-	private void addCommands()
-	{
-		viewer.addEventHandler(ScrollEvent.SCROLL, event -> {
+  private void addCommands() {
 
-			final double scroll = event.getDeltaY();
-			double scrollFactor = scroll > 0 ? 1.05 : 1 / 1.05;
+	viewer.addEventHandler(ScrollEvent.SCROLL, event -> {
 
-			if (event.isShiftDown())
-			{
-				if (event.isControlDown())
-				{
-					scrollFactor = scroll > 0 ? 1.01 : 1 / 1.01;
-				}
-				else
-				{
-					scrollFactor = scroll > 0 ? 2.05 : 1 / 2.05;
-				}
-			}
 
-			if (Math.abs(event.getDeltaY()) > Math.abs(event.getDeltaX()))
-			{
-				final Affine target = affine.clone();
-				target.prependScale(scrollFactor, scrollFactor, scrollFactor);
-				InvokeOnJavaFXApplicationThread.invoke(() -> this.setAffine(target));
+	  final double scroll = ControlUtils.getBiggestScroll(event);
+	  if ( scroll == 0) {
+	    event.consume();
+	    return;
+	  }
 
-				event.consume();
-			}
-		});
 
-		viewer.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
-			if (event.getCode().equals(KeyCode.Z) && event.isShiftDown())
-			{
-				InvokeOnJavaFXApplicationThread.invoke(() -> this.setAffine(initialTransform));
-				event.consume();
-			}
-		});
+	  double scrollFactor = scroll > 0 ? 1.05 : 1 / 1.05;
 
-		viewer.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
-			if (event.getCode().equals(KeyCode.P) && event.isControlDown())
-			{
-				InvokeOnJavaFXApplicationThread.invoke(() -> {
-					saveAsPng();
-				});
-				event.consume();
-			}
+	  if (event.isShiftDown()) {
+		if (event.isControlDown()) {
+		  scrollFactor = scroll > 0 ? 1.01 : 1 / 1.01;
+		} else {
+		  scrollFactor = scroll > 0 ? 2.05 : 1 / 2.05;
+		}
+	  }
+	  final Affine target = affine.clone();
+	  target.prependScale(scrollFactor, scrollFactor, scrollFactor);
+	  InvokeOnJavaFXApplicationThread.invoke(() -> this.setAffine(target));
+	  event.consume();
+	});
+
+	viewer.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
+	  if (event.getCode().equals(KeyCode.Z) && event.isShiftDown()) {
+		InvokeOnJavaFXApplicationThread.invoke(() -> this.setAffine(initialTransform));
+		event.consume();
+	  }
+	});
+
+	viewer.addEventHandler(KeyEvent.KEY_PRESSED, event -> {
+	  if (event.getCode().equals(KeyCode.P) && event.isControlDown()) {
+		InvokeOnJavaFXApplicationThread.invoke(() -> {
+		  saveAsPng();
 		});
-	}
+		event.consume();
+	  }
+	});
+  }
 
 	private class Rotate extends MouseDragFX
 	{