JAL-4034 Fix #2 show an icon and a button to press to initiate search

[jalview.git] / src / jalview / gui / OverviewPanel.java

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 567a121..adde919 100755 (executable)
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -32,8 +32,6 @@ import jalview.viewmodel.ViewportListenerI;
 import java.awt.BorderLayout;
 import java.awt.Cursor;
 import java.awt.Dimension;
-import java.awt.Image;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ComponentAdapter;
@@ -44,7 +42,6 @@ import java.awt.event.MouseMotionAdapter;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyVetoException;
 
-import javax.swing.ImageIcon;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JInternalFrame;
 import javax.swing.JPanel;
@@ -58,28 +55,25 @@ import javax.swing.SwingUtilities;
  * @author $author$
  * @version $Revision$
  */
+@SuppressWarnings("serial")
 public class OverviewPanel extends JPanel
         implements Runnable, ViewportListenerI
 {
-  protected Image dragImage = new ImageIcon(
-          getClass().getResource("/images/dragcursor.png"))
-                  .getImage();
-
-  private OverviewDimensions od;
+  protected OverviewDimensions od;
 
   private OverviewCanvas oviewCanvas;
 
-  private AlignViewport av;
+  protected AlignViewport av;
 
   private AlignmentPanel ap;
 
-  private JCheckBoxMenuItem displayToggle;
+  protected JCheckBoxMenuItem displayToggle;
 
-  private boolean showHidden = true;
+  protected boolean showHidden = true;
 
-  private boolean draggingBox = false;
+  protected boolean draggingBox = false;
 
-  private ProgressPanel progressPanel;
+  protected ProgressPanel progressPanel;
 
   /**
    * Creates a new OverviewPanel object.
@@ -93,12 +87,12 @@ public class OverviewPanel extends JPanel
     this.ap = alPanel;
 
     showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START,
-            true);
+            false);
     if (showHidden)
     {
       od = new OverviewDimensionsShowHidden(av.getRanges(),
-            (av.isShowAnnotation()
-                    && av.getAlignmentConservationAnnotation() != null));
+              (av.isShowAnnotation()
+                      && av.getAlignmentConservationAnnotation() != null));
     }
     else
     {
@@ -120,22 +114,6 @@ public class OverviewPanel extends JPanel
     // without this the overview window does not size to fit the overview canvas
     setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
 
-    // set up custom cursor for use on Mac...
-    Point hotSpot = new Point(16, 16);
-    String cursorName = "Custom drag cursor";
-    
-    Cursor tempCursor;
-    if (Platform.isAMac())
-    {
-      tempCursor = getToolkit().createCustomCursor(dragImage, hotSpot,
-              cursorName);
-    }
-    else
-    {
-      tempCursor = Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR);
-    }
-    final Cursor dragCursor = tempCursor;
-    
     addComponentListener(new ComponentAdapter()
     {
       @Override
@@ -195,14 +173,18 @@ public class OverviewPanel extends JPanel
       {
         if (od.isPositionInBox(evt.getX(), evt.getY()))
         {
-          // display drag cursor at mouse position
-          getParent().setCursor(dragCursor);
+          /*
+           * 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.DEFAULT_CURSOR));
+                  Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
         }
       }
 
@@ -213,32 +195,38 @@ public class OverviewPanel extends JPanel
       @Override
       public void mousePressed(MouseEvent evt)
       {
+
+        if (Platform.isWinRightButton(evt))
+        {
+          showPopupMenu(evt);
+          return;
+        }
         if (SwingUtilities.isRightMouseButton(evt))
         {
-          if (!Platform.isAMac())
-          {
-            showPopupMenu(evt);
-          }
+          return;
+        }
+        // don't do anything if the mouse press is in the overview's box
+        // (wait to see if it's a drag instead)
+        // otherwise update the viewport
+        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
         {
-          // don't do anything if the mouse press is in the overview's box
-          // (wait to see if it's a drag instead)
-          // otherwise update the viewport
-          if (!od.isPositionInBox(evt.getX(), evt.getY()))
-          {
-            draggingBox = false;
-            od.updateViewportFromMouse(evt.getX(), evt.getY(),
-                    av.getAlignment().getHiddenSequences(),
-                    av.getAlignment().getHiddenColumns());
-          }
-          else
-          {
-            draggingBox = true;
-            od.setDragPoint(evt.getX(), evt.getY(),
-                    av.getAlignment().getHiddenSequences(),
-                    av.getAlignment().getHiddenColumns());
-          }
+          draggingBox = true;
+          od.setDragPoint(evt.getX(), evt.getY(),
+                  av.getAlignment().getHiddenSequences(),
+                  av.getAlignment().getHiddenColumns());
         }
       }
 
@@ -249,26 +237,30 @@ public class OverviewPanel extends JPanel
         {
           showPopupMenu(evt);
         }
-        // click in box should also reset the cursor
-        else if (od.isPositionInBox(evt.getX(), evt.getY()))
-        {
-          // display drag cursor at mouse position
-          getParent().setCursor(dragCursor);
-        }
-        else
-        {
-          // reset cursor
-          getParent().setCursor(
-                  Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-        }
       }
+
+      @Override
+      public void mouseReleased(MouseEvent evt)
+      {
+        draggingBox = false;
+      }
+
     });
+
+    /*
+     * Javascript does not call componentResized on initial display,
+     * so do the update here
+     */
+    if (Platform.isJS())
+    {
+      updateOverviewImage();
+    }
   }
 
   /*
    * Displays the popup menu and acts on user input
    */
-  private void showPopupMenu(MouseEvent e)
+  protected void showPopupMenu(MouseEvent e)
   {
     JPopupMenu popup = new JPopupMenu();
     ActionListener menuListener = new ActionListener()
@@ -293,7 +285,7 @@ public class OverviewPanel extends JPanel
   /*
    * Toggle overview display between showing hidden columns and hiding hidden columns
    */
-  private void toggleHiddenColumns()
+  protected void toggleHiddenColumns()
   {
     if (showHidden)
     {
@@ -332,7 +324,7 @@ public class OverviewPanel extends JPanel
       od.setWidth(getWidth());
       od.setHeight(getHeight() - progressPanel.getHeight());
     }
-    
+
     setPreferredSize(new Dimension(od.getWidth(),
             od.getHeight() + progressPanel.getHeight()));
 
@@ -345,7 +337,6 @@ public class OverviewPanel extends JPanel
     thread.start();
     repaint();
 
-    
   }
 
   @Override
@@ -416,8 +407,9 @@ public class OverviewPanel extends JPanel
        * close the parent frame (which also removes it from the
        * Desktop Windows menu)
        */
-      ((JInternalFrame) SwingUtilities.getAncestorOfClass(
-              JInternalFrame.class, (this))).setClosed(true);
+      ((JInternalFrame) SwingUtilities
+              .getAncestorOfClass(JInternalFrame.class, (this)))
+                      .setClosed(true);
     } catch (PropertyVetoException e)
     {
       // ignore