X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdwidthAdjuster.java;h=8400543ac1467cac3d0d3692cf95fb0b09a10a81;hb=106a3890f956e2aa7780b2985f4326655912a558;hp=c62ab9112f41ceae635005d5ef649bd363bd592b;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/gui/IdwidthAdjuster.java b/src/jalview/gui/IdwidthAdjuster.java
index c62ab91..8400543 100755
--- a/src/jalview/gui/IdwidthAdjuster.java
+++ b/src/jalview/gui/IdwidthAdjuster.java
@@ -1,26 +1,35 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import jalview.api.AlignViewportI;
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+
+import javax.swing.JPanel;
/**
* DOCUMENT ME!
@@ -28,8 +37,8 @@ import javax.swing.*;
* @author $author$
* @version $Revision$
*/
-public class IdwidthAdjuster extends JPanel implements MouseListener,
- MouseMotionListener
+public class IdwidthAdjuster extends JPanel
+ implements MouseListener, MouseMotionListener
{
boolean active = false;
@@ -66,6 +75,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mousePressed(MouseEvent evt)
{
oldX = evt.getX();
@@ -77,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();
+ }
+
}
/**
@@ -89,6 +114,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseEntered(MouseEvent evt)
{
active = true;
@@ -101,6 +127,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseExited(MouseEvent evt)
{
active = false;
@@ -113,18 +140,21 @@ public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseDragged(MouseEvent evt)
{
active = true;
- Dimension d = ap.idPanel.idCanvas.getPreferredSize();
+ final AlignViewportI viewport = ap.getAlignViewport();
+ int curwidth = viewport.getIdWidth();
int dif = evt.getX() - oldX;
- if (((d.width + dif) > 20) || (dif > 0))
+ final int newWidth = curwidth + dif;
+ if ((newWidth > 20) || (dif > 0))
{
- ap.idPanel.idCanvas.setPreferredSize(new Dimension(d.width + dif,
- d.height));
- ap.paintAlignment(true);
+ viewport.setIdWidth(newWidth);
+
+ ap.paintAlignment(true, false);
}
oldX = evt.getX();
@@ -136,6 +166,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseMoved(MouseEvent evt)
{
}
@@ -146,6 +177,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
@@ -156,6 +188,7 @@ public class IdwidthAdjuster extends JPanel implements MouseListener,
* @param g
* DOCUMENT ME!
*/
+ @Override
public void paintComponent(Graphics g)
{
g.setColor(Color.white);