Merge branch 'feature/JAL-3690_callback-based-web-services' into alpha/JAL-3066_Jalvi...

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

diff --git a/src/jalview/gui/IdwidthAdjuster.java b/src/jalview/gui/IdwidthAdjuster.java
index 0cffc3b..4ba0699 100755 (executable)
--- a/src/jalview/gui/IdwidthAdjuster.java
+++ b/src/jalview/gui/IdwidthAdjuster.java
@@ -40,7 +40,7 @@ import javax.swing.JPanel;
 public class IdwidthAdjuster extends JPanel
         implements MouseListener, MouseMotionListener
 {
-  boolean active = false;
+  public static final int MIN_ID_WIDTH = 20;
 
   int oldX = 0;
 
@@ -61,10 +61,9 @@ public class IdwidthAdjuster extends JPanel
   }
 
   /**
-   * DOCUMENT ME!
+   * Action on mouse pressed is to save the start position for any drag
    * 
    * @param evt
-   *          DOCUMENT ME!
    */
   @Override
   public void mousePressed(MouseEvent evt)
@@ -73,121 +72,103 @@ public class IdwidthAdjuster extends JPanel
   }
 
   /**
-   * DOCUMENT ME!
+   * On release of mouse drag to resize the width, if there is a complementary
+   * alignment in a split frame, sets the complement to the same id width and
+   * repaints the split frame. Note this is done whether or not the protein
+   * characters are scaled to codon width.
    * 
    * @param evt
-   *          DOCUMENT ME!
    */
   @Override
   public void mouseReleased(MouseEvent evt)
   {
-    active = false;
     repaint();
 
     /*
-     * If in a SplitFrame with co-scaled alignments, set the other's id width to
-     * match
+     * If in a SplitFrame, set the other's id width to match
      */
     final AlignViewportI viewport = ap.getAlignViewport();
-    if (viewport.getCodingComplement() != null
-            && viewport.isScaleProteinAsCdna())
+    if (viewport.getCodingComplement() != null)
     {
       viewport.getCodingComplement().setIdWidth(viewport.getIdWidth());
       SplitFrame sf = (SplitFrame) ap.alignFrame.getSplitViewContainer();
       sf.repaint();
     }
-
   }
 
   /**
-   * DOCUMENT ME!
+   * When this region is entered, repaints to show a left-right move cursor
    * 
    * @param evt
-   *          DOCUMENT ME!
    */
   @Override
   public void mouseEntered(MouseEvent evt)
   {
-    active = true;
     repaint();
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
   @Override
   public void mouseExited(MouseEvent evt)
   {
-    active = false;
-    repaint();
   }
 
   /**
-   * DOCUMENT ME!
+   * Adjusts the id panel width for a mouse drag left or right (subject to a
+   * minimum of 20 pixels) and repaints the alignment
    * 
    * @param evt
-   *          DOCUMENT ME!
    */
   @Override
   public void mouseDragged(MouseEvent evt)
   {
-    active = true;
-
+    int mouseX = evt.getX();
     final AlignViewportI viewport = ap.getAlignViewport();
     int curwidth = viewport.getIdWidth();
-    int dif = evt.getX() - oldX;
+    int dif = mouseX - oldX;
 
     final int newWidth = curwidth + dif;
-    if ((newWidth > 20) || (dif > 0))
-    {
-      viewport.setIdWidth(newWidth);
 
-      ap.paintAlignment(true, false);
+    /*
+     * don't drag below minimum width
+     */
+    if (newWidth < MIN_ID_WIDTH)
+    {
+      return;
     }
 
     oldX = evt.getX();
+
+    /*
+     * don't drag right if mouse is to the left of the region
+     */
+    if (dif > 0 && mouseX < 0)
+    {
+      return;
+    }
+    viewport.setIdWidth(newWidth);
+    ap.paintAlignment(true, false);
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
   @Override
   public void mouseMoved(MouseEvent evt)
   {
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param evt
-   *          DOCUMENT ME!
-   */
   @Override
   public void mouseClicked(MouseEvent evt)
   {
   }
 
   /**
-   * DOCUMENT ME!
+   * Paints this region, showing a left-right move cursor if currently 'active'
    * 
    * @param g
-   *          DOCUMENT ME!
    */
   @Override
   public void paintComponent(Graphics g)
   {
     g.setColor(Color.white);
     g.fillRect(0, 0, getWidth(), getHeight());
-
-    if (active)
-    {
-        setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
-    }
+    setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
   }
 }