X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=09e54e7ef39a4eef1b1de585ec05095ca718fc4a;hp=1855c3d322a0b079ccaa1eb43e97478e8157f89d;hb=f96e6a945e2df8a844f428c08cfc08210d937fc0;hpb=62f2ed464010270830afcfe954647a51dfb5114b

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 1855c3d..09e54e7 100755
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -44,6 +44,8 @@ import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 import java.beans.PropertyChangeEvent;
 
+import javax.swing.SwingUtilities;
+
 public class OverviewPanel extends Panel implements Runnable,
         MouseMotionListener, MouseListener, ViewportListenerI
 {
@@ -114,8 +116,8 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseClicked(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiersEx()
+            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
     {
       showPopupMenu(evt);
     }
@@ -126,23 +128,23 @@ public class OverviewPanel extends Panel implements Runnable,
   {
     if (od.isPositionInBox(evt.getX(), evt.getY()))
     {
-      // display drag cursor at mouse position
-      setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+      this.getParent()
+              .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
     }
     else
     {
-      // reset cursor
-      setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+      this.getParent().setCursor(
+              Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
     }
   }
 
   @Override
   public void mousePressed(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiersEx()
+            & InputEvent.BUTTON3_DOWN_MASK) == InputEvent.BUTTON3_DOWN_MASK)
     {
-      if (!Platform.isAMac())
+      if (!Platform.isMac()) // BH was excluding JavaScript
       {
         showPopupMenu(evt);
       }
@@ -153,11 +155,17 @@ public class OverviewPanel extends Panel implements Runnable,
       // (wait to see if it's a drag instead)
       // otherwise update the viewport
       if (!od.isPositionInBox(evt.getX(), evt.getY()))
-      { 
-    	draggingBox = false;
+      {
+        draggingBox = false;
+
+        // display drag cursor at mouse position
+        setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+
         od.updateViewportFromMouse(evt.getX(), evt.getY(),
                 av.getAlignment().getHiddenSequences(),
                 av.getAlignment().getHiddenColumns());
+        getParent()
+                .setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
       }
       else
       {
@@ -172,37 +180,38 @@ public class OverviewPanel extends Panel implements Runnable,
   @Override
   public void mouseReleased(MouseEvent evt)
   {
+    draggingBox = false;
   }
 
   @Override
   public void mouseDragged(MouseEvent evt)
   {
-    if ((evt.getModifiers()
-            & InputEvent.BUTTON3_MASK) == InputEvent.BUTTON3_MASK)
+    if (Platform.isWinRightButton(evt))
     {
-      if (!Platform.isAMac())
-      {
-        showPopupMenu(evt);
-      }
+      showPopupMenu(evt);
+      return;
+    }
+
+    if (SwingUtilities.isRightMouseButton(evt))
+    {
+      return;
+    }
+
+    if (draggingBox)
+    {
+      // set the mouse position as a fixed point in the box
+      // and drag relative to that position
+      od.adjustViewportFromMouse(evt.getX(), evt.getY(),
+              av.getAlignment().getHiddenSequences(),
+              av.getAlignment().getHiddenColumns());
     }
     else
     {
-      if (draggingBox)
-      {
-        // set the mouse position as a fixed point in the box
-        // and drag relative to that position
-        od.adjustViewportFromMouse(evt.getX(), evt.getY(),
-                av.getAlignment().getHiddenSequences(),
-                av.getAlignment().getHiddenColumns());
-      }
-      else
-      {
-        od.updateViewportFromMouse(evt.getX(), evt.getY(),
-                av.getAlignment().getHiddenSequences(),
-                av.getAlignment().getHiddenColumns());
-      }
-      ap.paintAlignment(false, false);
+      od.updateViewportFromMouse(evt.getX(), evt.getY(),
+              av.getAlignment().getHiddenSequences(),
+              av.getAlignment().getHiddenColumns());
     }
+    ap.paintAlignment(false, false);
   }
 
   /**
@@ -329,6 +338,10 @@ public class OverviewPanel extends Panel implements Runnable,
     } finally
     {
       av = null;
+      if (oviewCanvas != null)
+      {
+        oviewCanvas.dispose();
+      }
       oviewCanvas = null;
       ap = null;
       od = null;