Merge branch 'bug/JAL-2621' into develop

Conflicts:
	src/jalview/gui/OverviewPanel.java

diff --combined src/jalview/appletgui/OverviewPanel.java
index 5081509,0c0bf37..96138bf
--- 1/src/jalview/appletgui/OverviewPanel.java
--- 2/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@@ -126,13 -126,14 +126,14 @@@ public class OverviewPanel extends Pane
    {
      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));
      }
    }
  
@@@ -155,13 -156,11 +156,15 @@@
        if (!od.isPositionInBox(evt.getX(), evt.getY()))
        { 
        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
        {
@@@ -176,7 -175,6 +179,7 @@@
    @Override
    public void mouseReleased(MouseEvent evt)
    {
 +    draggingBox = false;
    }
  
    @Override
@@@ -334,10 -332,6 +337,10 @@@
      } finally
      {
        av = null;
 +      if (oviewCanvas != null)
 +      {
 +        oviewCanvas.dispose();
 +      }
        oviewCanvas = null;
        ap = null;
        od = null;

diff --combined src/jalview/gui/OverviewPanel.java
index a73a06a,ee478a5..9d0a55d
--- 1/src/jalview/gui/OverviewPanel.java
--- 2/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@@ -86,7 -86,7 +86,7 @@@ public class OverviewPanel extends JPan
      this.ap = alPanel;
  
      showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START,
 -            true);
 +            false);
      if (showHidden)
      {
        od = new OverviewDimensionsShowHidden(av.getRanges(),
@@@ -112,7 -112,7 +112,7 @@@
  
      // without this the overview window does not size to fit the overview canvas
      setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
- 
+     
      addComponentListener(new ComponentAdapter()
      {
        @Override
@@@ -170,22 -170,23 +170,23 @@@
        @Override
        public void mouseMoved(MouseEvent evt)
        {
-         if (!draggingBox)
-         // don't bother changing the cursor if we're dragging the box
-         // as we can't have moved inside or out of the box in that case
+         if (od.isPositionInBox(evt.getX(), evt.getY()))
          {
-           if (od.isPositionInBox(evt.getX(), evt.getY()))
-           {
-             // display drag cursor at mouse position
-             setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
-           }
-           else
-           {
-             // reset cursor
-             setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-           }
+           /*
+            * using HAND_CURSOR rather than DRAG_CURSOR 
+            * as the latter is not supported on Mac
+            */
+           getParent().setCursor(
+                   Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+         }
+         else
+         {
+           // reset cursor
+           getParent().setCursor(
+                   Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
          }
        }
+ 
      });
  
      addMouseListener(new MouseAdapter()
@@@ -208,13 -209,11 +209,15 @@@
            if (!od.isPositionInBox(evt.getX(), evt.getY()))
            {
              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
            {
@@@ -234,13 -233,6 +237,13 @@@
            showPopupMenu(evt);
          }
        }
 +
 +      @Override
 +      public void mouseReleased(MouseEvent evt)
 +      {
 +        draggingBox = false;
 +      }
 +
      });
    }