Changeset 633

Timestamp:

12/17/13 16:23:33 (10 years ago)

Author:

jts21

Message:

Fix accidentally following links while panning, and make panning only start after moving the cursor 5 pixels

File:

• trunk/src/org/expeditee/gui/FrameMouseActions.java (modified) (5 diffs)

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -250 +250 @@
                 }
                 
-                // update panning position values so position doesn't jump
-                lastX = e.getX();
-                lastY = e.getY();
+                if(ExperimentalFeatures.MousePan) {
+                // don't pan if we're not over the frame
+                _overFrame = FrameUtils.getCurrentItem() == null;
+                _isPanOp = false;
+                // update panning position values so position doesn't jump
+                panStartX = e.getX();
+                panStartY = e.getY();
+                MouseX = panStartX;
+                MouseY = panStartY;
+                }
 
                 // System.out.println(modifiersEx);
@@ -493 +500 @@
 
                 // Only a no op if user releases in free space!
-                if (_isNoOp && (releasedOn == null && releasedIn == null)) {
+                if (_isPanOp || (_isNoOp && (releasedOn == null && releasedIn == null))) {
                         if (_isDelete) {
                                 _isDelete = false;
@@ -513 +520 @@
                         }
 
-                        MessageBay
-                                        .displayMessage("Action cancelled, mouse moved more than "
+                        if(!_isPanOp) {
+                                MessageBay.displayMessage("Action cancelled, mouse moved more than "
                                                         + UserSettings.NoOpThreshold + " pixels.");
+                        }
                         FrameGraphics.Repaint();
                         return;
@@ -1650 +1658 @@
         }
 
-        private int lastX, lastY;
+        private boolean _overFrame;
+        private int panStartX, panStartY;
+        private boolean _isPanOp;
         public void mouseDragged(MouseEvent e) {
                 _lastMouseDragged = e;
@@ -1676 +1686 @@
                 
                 // panning the frame when dragging the mouse while shift-leftclicking
-                if(ExperimentalFeatures.MousePan && e.isShiftDown() && (e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0) {
-                        int dX = (int) (e.getX() - lastX);
-                        int dY = (int) (e.getY() - lastY);
+                if(ExperimentalFeatures.MousePan && _overFrame && e.isShiftDown() &&
+                                (e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0 &&
+                                (_isPanOp || (Math.max(Math.abs(panStartX - e.getX()), Math.abs(panStartY - e.getY())) > 5))) {
+                        int dX = (int) (e.getX() - MouseX);
+                        int dY = (int) (e.getY() - MouseY);
                         Misc.pan(DisplayIO.getCurrentFrame(), dX, dY);
-                }
-                lastX = e.getX();
-                lastY = e.getY();
+                        MouseX = e.getX();
+                        MouseY = e.getY();
+                        _isPanOp = true;
+                }
 
                 // check if user is dragging across a text item