X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=5da4ae0a15b1ab62a6830833574fcbee514aa129;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=0d5c1233362b2d5c1073306f5e165fcc523f1925;hpb=549937ad2a0de178aa58ad3b00624b31d44bee64;p=jalview.git

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 0d5c123..5da4ae0 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -20,6 +20,7 @@
  */
 package jalview.gui;
 
+import jalview.api.AlignViewportI;
 import jalview.bin.Cache;
 import jalview.renderer.OverviewRenderer;
 import jalview.util.MessageManager;
@@ -55,51 +56,58 @@ import javax.swing.SwingUtilities;
  * @author $author$
  * @version $Revision$
  */
+@SuppressWarnings("serial")
 public class OverviewPanel extends JPanel
         implements Runnable, ViewportListenerI
 {
-  private OverviewDimensions od;
+  protected OverviewDimensions od;
 
   private OverviewCanvas oviewCanvas;
 
-  private AlignViewport av;
+  private AlignViewportI 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;
+  private Dimension dim;
+  
+  private boolean showProgress = !Platform.isJS();
+  protected ProgressPanel progressPanel;
 
+  
   /**
-   * Creates a new OverviewPanel object.
-   * 
-   * @param alPanel
-   *          The alignment panel which is shown in the overview panel
+   * Creates the appropriate type of OverviewDimensions, with the desired size
    */
-  public OverviewPanel(AlignmentPanel alPanel)
+  private void createOverviewDimensions()
   {
-    this.av = alPanel.av;
-    this.ap = alPanel;
-
-    showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START,
-            true);
+    boolean showAnnotation = (av.isShowAnnotation()
+            && av.getAlignmentConservationAnnotation() != null);
     if (showHidden)
     {
-      od = new OverviewDimensionsShowHidden(av.getRanges(),
-            (av.isShowAnnotation()
-                    && av.getAlignmentConservationAnnotation() != null));
+      od = new OverviewDimensionsShowHidden(av.getRanges(), showAnnotation,
+              dim);
     }
     else
     {
-      od = new OverviewDimensionsHideHidden(av.getRanges(),
-              (av.isShowAnnotation()
-                      && av.getAlignmentConservationAnnotation() != null));
+      od = new OverviewDimensionsHideHidden(av.getRanges(), showAnnotation,
+              dim);
     }
+  }
+
+  public OverviewPanel(AlignmentPanel alPanel, Dimension dim)
+  {
+    this.av = alPanel.av;
+    this.ap = alPanel;
+    this.dim = dim;
 
+    showHidden = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START,
+            false);
+    createOverviewDimensions();
     setLayout(new BorderLayout());
     progressPanel = new ProgressPanel(OverviewRenderer.UPDATE,
             MessageManager.getString("label.oview_calc"), getWidth());
@@ -112,7 +120,7 @@ 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()));
-
+    
     addComponentListener(new ComponentAdapter()
     {
       @Override
@@ -170,22 +178,23 @@ public class OverviewPanel extends JPanel
       @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()
@@ -193,15 +202,14 @@ public class OverviewPanel extends JPanel
       @Override
       public void mousePressed(MouseEvent evt)
       {
-        if (SwingUtilities.isRightMouseButton(evt))
-        {
-          if (!Platform.isAMac())
-          {
-            showPopupMenu(evt);
-          }
+    	  
+    	if (Platform.isWinRightButton(evt)) {
+    		showPopupMenu(evt);
+    		return;
+    	}
+        if (SwingUtilities.isRightMouseButton(evt)) {
+        	return;
         }
-        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
@@ -215,6 +223,8 @@ public class OverviewPanel extends JPanel
             od.updateViewportFromMouse(evt.getX(), evt.getY(),
                     av.getAlignment().getHiddenSequences(),
                     av.getAlignment().getHiddenColumns());
+            getParent().setCursor(
+                    Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
           }
           else
           {
@@ -223,7 +233,6 @@ public class OverviewPanel extends JPanel
                     av.getAlignment().getHiddenSequences(),
                     av.getAlignment().getHiddenColumns());
           }
-        }
       }
 
       @Override
@@ -247,13 +256,16 @@ public class OverviewPanel extends JPanel
      * Javascript does not call componentResized on initial display,
      * so do the update here
      */
-    /** @j2sNative this.updateOverviewImage(); */
+    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()
@@ -278,22 +290,10 @@ public class OverviewPanel extends JPanel
   /*
    * Toggle overview display between showing hidden columns and hiding hidden columns
    */
-  private void toggleHiddenColumns()
+  protected void toggleHiddenColumns()
   {
-    if (showHidden)
-    {
-      showHidden = false;
-      od = new OverviewDimensionsHideHidden(av.getRanges(),
-              (av.isShowAnnotation()
-                      && av.getAlignmentConservationAnnotation() != null));
-    }
-    else
-    {
-      showHidden = true;
-      od = new OverviewDimensionsShowHidden(av.getRanges(),
-              (av.isShowAnnotation()
-                      && av.getAlignmentConservationAnnotation() != null));
-    }
+    showHidden = !showHidden;
+    createOverviewDimensions();
     oviewCanvas.resetOviewDims(od);
     updateOverviewImage();
     setBoxPosition();