X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdwidthAdjuster.java;fp=src%2Fjalview%2Fgui%2FIdwidthAdjuster.java;h=0cffc3b350c85cadbc20e01197b7bdea8ff4b153;hb=4f77328104498504339216829abf5ea87e2791ec;hp=2c273ad07c3fceb94ed64a1e9e3d6ab109e8093f;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git

diff --git a/src/jalview/gui/IdwidthAdjuster.java b/src/jalview/gui/IdwidthAdjuster.java
index 2c273ad..0cffc3b 100755
--- a/src/jalview/gui/IdwidthAdjuster.java
+++ b/src/jalview/gui/IdwidthAdjuster.java
@@ -24,8 +24,10 @@ import jalview.api.AlignViewportI;
 
 import java.awt.Color;
 import java.awt.Cursor;
-import java.awt.event.MouseAdapter;
+import java.awt.Graphics;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
 
 import javax.swing.JPanel;
 
@@ -35,77 +37,157 @@ import javax.swing.JPanel;
  * @author $author$
  * @version $Revision$
  */
-@SuppressWarnings("serial")
 public class IdwidthAdjuster extends JPanel
+        implements MouseListener, MouseMotionListener
 {
+  boolean active = false;
 
   int oldX = 0;
 
+  AlignmentPanel ap;
+
   /**
-   * Creates a new IdwidthAdjuster object above the id panel that can be dragged
-   * to change the panel's width
+   * Creates a new IdwidthAdjuster object.
    * 
    * @param ap
-   *          The associated AlignmentPanel
-   * 
+   *          DOCUMENT ME!
    */
   public IdwidthAdjuster(AlignmentPanel ap)
   {
-    // BH 2019.07.01 no need for overridden paintComponent, especially as it was
-    // overriding paint(g) so
-    // allowing strange component painting in its place.
-
+    this.ap = ap;
     setBackground(Color.white);
-    setOpaque(true);
+    addMouseListener(this);
+    addMouseMotionListener(this);
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param evt
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void mousePressed(MouseEvent evt)
+  {
+    oldX = evt.getX();
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @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
+     */
+    final AlignViewportI viewport = ap.getAlignViewport();
+    if (viewport.getCodingComplement() != null
+            && viewport.isScaleProteinAsCdna())
+    {
+      viewport.getCodingComplement().setIdWidth(viewport.getIdWidth());
+      SplitFrame sf = (SplitFrame) ap.alignFrame.getSplitViewContainer();
+      sf.repaint();
+    }
+
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @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!
+   * 
+   * @param evt
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void mouseDragged(MouseEvent evt)
+  {
+    active = true;
+
+    final AlignViewportI viewport = ap.getAlignViewport();
+    int curwidth = viewport.getIdWidth();
+    int dif = evt.getX() - oldX;
+
+    final int newWidth = curwidth + dif;
+    if ((newWidth > 20) || (dif > 0))
+    {
+      viewport.setIdWidth(newWidth);
+
+      ap.paintAlignment(true, false);
+    }
+
+    oldX = evt.getX();
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param evt
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void mouseMoved(MouseEvent evt)
+  {
+  }
 
-    setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param evt
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void mouseClicked(MouseEvent evt)
+  {
+  }
 
-    // BH 2019.07.01 MouseAdapter is cleaner - no need for fields active or ap
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param g
+   *          DOCUMENT ME!
+   */
+  @Override
+  public void paintComponent(Graphics g)
+  {
+    g.setColor(Color.white);
+    g.fillRect(0, 0, getWidth(), getHeight());
 
-    MouseAdapter ma = (new MouseAdapter()
+    if (active)
     {
-      @Override
-      public void mousePressed(MouseEvent evt)
-      {
-        oldX = evt.getX();
-      }
-
-      @Override
-      public void mouseDragged(MouseEvent evt)
-      {
-        AlignViewportI viewport = ap.getAlignViewport();
-        int curwidth = viewport.getIdWidth();
-        int dif = evt.getX() - oldX;
-        int newWidth = curwidth + dif;
-        if ((newWidth > 20) || (dif > 0))
-        {
-          viewport.setIdWidth(newWidth);
-          ap.paintAlignment(true, false);
-        }
-        oldX = evt.getX();
-      }
-
-      @Override
-      public void mouseReleased(MouseEvent evt)
-      {
-
-        // If in a SplitFrame with co-scaled alignments, set the other's id
-        // width to match
-
-        AlignViewportI viewport = ap.getAlignViewport();
-        if (viewport.getCodingComplement() != null
-                && viewport.isScaleProteinAsCdna())
-        {
-          viewport.getCodingComplement().setIdWidth(viewport.getIdWidth());
-          SplitFrame sf = (SplitFrame) ap.alignFrame
-                  .getSplitViewContainer();
-          sf.repaint();
-        }
-
-      }
-
-    });
-    addMouseListener(ma);
-    addMouseMotionListener(ma);
+        setCursor(Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR));
+    }
   }
 }