From 66a4e3a5cf0583099cd9e58f8f9ef8a579f942d5 Mon Sep 17 00:00:00 2001
From: tpietzsch <tobias.pietzsch@gmail.com>
Date: Thu, 17 Sep 2020 18:01:48 +0200
Subject: [PATCH] TransformEventHandler2D: by default scrolling zooms (instead
 of rotating)

---
 src/main/java/bdv/TransformEventHandler2D.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/bdv/TransformEventHandler2D.java b/src/main/java/bdv/TransformEventHandler2D.java
index 056c210b..667ed0d6 100644
--- a/src/main/java/bdv/TransformEventHandler2D.java
+++ b/src/main/java/bdv/TransformEventHandler2D.java
@@ -77,9 +77,9 @@ public class TransformEventHandler2D implements TransformEventHandler
 	private static final String[] DRAG_TRANSLATE_KEYS = new String[] { "button2", "button3" };
 	private static final String[] DRAG_ROTATE_KEYS = new String[] { "button1" };
 
-	private static final String[] ZOOM_NORMAL_KEYS = new String[] { "meta scroll", "ctrl shift scroll" };
+	private static final String[] ZOOM_NORMAL_KEYS = new String[] { "scroll", "meta scroll", "ctrl shift scroll" };
 	private static final String[] SCROLL_TRANSLATE_KEYS = new String[] { "not mapped" };
-	private static final String[] SCROLL_ROTATE_KEYS = new String[] { "scroll" };
+	private static final String[] SCROLL_ROTATE_KEYS = new String[] { "not mapped" };
 	private static final String[] ROTATE_LEFT_KEYS = new String[] { "LEFT" };
 	private static final String[] ROTATE_RIGHT_KEYS = new String[] { "RIGHT" };
 	private static final String[] KEY_ZOOM_IN_KEYS = new String[] { "UP" };
@@ -87,15 +87,15 @@ public class TransformEventHandler2D implements TransformEventHandler
 
 	private static final String[] ZOOM_FAST_KEYS = new String[] { "shift scroll" };
 	private static final String[] SCROLL_TRANSLATE_FAST_KEYS = new String[] { "not mapped" };
-	private static final String[] SCROLL_TRANSLATE_SLOW_KEYS = new String[] { "not mapped" };
+	private static final String[] SCROLL_ROTATE_FAST_KEYS = new String[] { "not mapped" };
 	private static final String[] ROTATE_LEFT_FAST_KEYS = new String[] { "shift LEFT" };
 	private static final String[] ROTATE_RIGHT_FAST_KEYS = new String[] { "shift RIGHT" };
 	private static final String[] KEY_ZOOM_IN_FAST_KEYS = new String[] { "shift UP" };
 	private static final String[] KEY_ZOOM_OUT_FAST_KEYS = new String[] { "shift DOWN" };
 
 	private static final String[] ZOOM_SLOW_KEYS = new String[] { "ctrl scroll" };
-	private static final String[] SCROLL_ROTATE_FAST_KEYS = new String[] { "shift scroll" };
-	private static final String[] SCROLL_ROTATE_SLOW_KEYS = new String[] { "ctrl scroll" };
+	private static final String[] SCROLL_TRANSLATE_SLOW_KEYS = new String[] { "not mapped" };
+	private static final String[] SCROLL_ROTATE_SLOW_KEYS = new String[] { "not mapped" };
 	private static final String[] ROTATE_LEFT_SLOW_KEYS = new String[] { "ctrl LEFT" };
 	private static final String[] ROTATE_RIGHT_SLOW_KEYS = new String[] { "ctrl RIGHT" };
 	private static final String[] KEY_ZOOM_IN_SLOW_KEYS = new String[] { "ctrl UP" };
-- 
GitLab