X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FIdwidthAdjuster.java;h=8400543ac1467cac3d0d3692cf95fb0b09a10a81;hb=07c06919a5e944dd12f751a5f23bcb79887cc11e;hp=71e2040f05f7c7fbfa8ad62b690f2e493052bc19;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/src/jalview/gui/IdwidthAdjuster.java b/src/jalview/gui/IdwidthAdjuster.java index 71e2040..8400543 100755 --- a/src/jalview/gui/IdwidthAdjuster.java +++ b/src/jalview/gui/IdwidthAdjuster.java @@ -20,6 +20,8 @@ */ package jalview.gui; +import jalview.api.AlignViewportI; + import java.awt.Color; import java.awt.Graphics; import java.awt.Image; @@ -35,8 +37,8 @@ import javax.swing.JPanel; * @author $author$ * @version $Revision$ */ -public class IdwidthAdjuster extends JPanel implements MouseListener, - MouseMotionListener +public class IdwidthAdjuster extends JPanel + implements MouseListener, MouseMotionListener { boolean active = false; @@ -73,6 +75,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @param evt * DOCUMENT ME! */ + @Override public void mousePressed(MouseEvent evt) { oldX = evt.getX(); @@ -84,10 +87,25 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @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(); + } + } /** @@ -96,6 +114,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @param evt * DOCUMENT ME! */ + @Override public void mouseEntered(MouseEvent evt) { active = true; @@ -108,6 +127,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @param evt * DOCUMENT ME! */ + @Override public void mouseExited(MouseEvent evt) { active = false; @@ -120,18 +140,21 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @param evt * DOCUMENT ME! */ + @Override public void mouseDragged(MouseEvent evt) { active = true; - int curwidth = ap.getAlignViewport().getIdWidth(); + final AlignViewportI viewport = ap.getAlignViewport(); + int curwidth = viewport.getIdWidth(); int dif = evt.getX() - oldX; - if (((curwidth + dif) > 20) || (dif > 0)) + final int newWidth = curwidth + dif; + if ((newWidth > 20) || (dif > 0)) { - ap.getAlignViewport().setIdWidth(curwidth + dif); + viewport.setIdWidth(newWidth); - ap.paintAlignment(true); + ap.paintAlignment(true, false); } oldX = evt.getX(); @@ -143,6 +166,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @param evt * DOCUMENT ME! */ + @Override public void mouseMoved(MouseEvent evt) { } @@ -153,6 +177,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @param evt * DOCUMENT ME! */ + @Override public void mouseClicked(MouseEvent evt) { } @@ -163,6 +188,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener, * @param g * DOCUMENT ME! */ + @Override public void paintComponent(Graphics g) { g.setColor(Color.white);