Updated to 1.7.1 with bug fix to scrolling + zoom.

ZenHarbinger · Mar 7, 2017 · c731b8e · c731b8e
1 parent 5a3edd1
commit c731b8e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 62 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.tros</groupId>
     <artifactId>torgo</artifactId>
-    <version>1.7.0</version>
+    <version>1.7.1</version>
     <packaging>jar</packaging>
     <name>torgo</name>
     <url>http://tros.org/torgo/</url>

diff --git a/src/main/java/org/tros/torgo/swing/TorgoUserInputPanel.java b/src/main/java/org/tros/torgo/swing/TorgoUserInputPanel.java
@@ -144,7 +144,7 @@ public TorgoUserInputPanel(Controller controller, String name, boolean editable,
         Font font = new Font(Font.MONOSPACED, Font.PLAIN, (int) prefs.getFloat("font-size", DEFAULT_FONT_SIZE));
         inputTextArea.setFont(font);
         outputTextArea.setFont(font);
-        zoom = new ZoomableMixin(inputTextArea);
+        zoom = new ZoomableMixin(scrollPane);
 
         inputTab.add(scrollPane, BorderLayout.CENTER);
 

diff --git a/src/main/java/org/tros/torgo/swing/ZoomableComponent.java b/src/main/java/org/tros/torgo/swing/ZoomableComponent.java
@@ -18,7 +18,6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseWheelEvent;
@@ -56,43 +55,8 @@ public ZoomableComponent(JComponent component) {
             zoomReset();
         };
 
-        final AtomicBoolean ctrlDown = new AtomicBoolean(false);
-        component.addKeyListener(new KeyListener() {
-            @Override
-            public void keyTyped(KeyEvent ke) {
-            }
-
-            @Override
-            public void keyPressed(KeyEvent ke) {
-                if ((ke.getModifiers() & KeyEvent.CTRL_MASK) != 0) {
-                    ctrlDown.set(true);
-                }
-                if ((ke.getKeyCode() == KeyEvent.VK_EQUALS)
-                        && (ke.getModifiers() == (KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK))
-                        || (ke.getKeyCode() == KeyEvent.VK_ADD)
-                        && (ke.getModifiers() == (KeyEvent.CTRL_MASK))) {
-                    increase.run();
-                }
-                if ((ke.getKeyCode() == KeyEvent.VK_MINUS || ke.getKeyCode() == KeyEvent.VK_SUBTRACT)
-                        && ((ke.getModifiers() == KeyEvent.CTRL_MASK))) {
-                    decrease.run();
-                }
-                if ((ke.getKeyCode() == KeyEvent.VK_0 || ke.getKeyCode() == KeyEvent.VK_NUMPAD0)
-                        && ((ke.getModifiers() == KeyEvent.CTRL_MASK))) {
-                    reset.run();
-                }
-            }
-
-            @Override
-            public void keyReleased(KeyEvent ke) {
-                if (ke.getModifiers() == 0) {
-                    ctrlDown.set(false);
-                }
-            }
-        });
-
         component.addMouseWheelListener((MouseWheelEvent mwe) -> {
-            if (ctrlDown.get()) {
+            if ((mwe.getModifiers() & KeyEvent.CTRL_MASK) == KeyEvent.CTRL_MASK) {
                 if (mwe.getPreciseWheelRotation() < 0) {
                     increase.run();
                 } else {
@@ -124,7 +88,7 @@ public void keyReleased(KeyEvent ke) {
                 try {
                     //HACK: for RSyntaxTextArea
                     Method method = component.getClass().getMethod("getPopupMenu");
-                    popupMenu = (JPopupMenu)method.invoke(component);
+                    popupMenu = (JPopupMenu) method.invoke(component);
                 } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
                     popupMenu = component.getComponentPopupMenu();
                 }
@@ -166,28 +130,6 @@ public void mouseExited(MouseEvent me) {
                 component.removeMouseListener(this);
             }
         });
-        component.addMouseListener(new MouseListener() {
-            @Override
-            public void mouseClicked(MouseEvent me) {
-            }
-
-            @Override
-            public void mousePressed(MouseEvent me) {
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent me) {
-            }
-
-            @Override
-            public void mouseEntered(MouseEvent me) {
-            }
-
-            @Override
-            public void mouseExited(MouseEvent me) {
-                ctrlDown.set(false);
-            }
-        });
     }
 
     protected abstract void zoomIn();