X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FIdwidthAdjuster.java;h=fe52738e9729770d0638978fd36c69bda1496332;hb=9876fdccf311378e690c1f9e18db52675d427b89;hp=77c0ca88ce8e42ad79ec6685cdb2ece288012428;hpb=4729e0d54d881dd53433a7bb85ce486f9ac37265;p=jalview.git
diff --git a/src/jalview/appletgui/IdwidthAdjuster.java b/src/jalview/appletgui/IdwidthAdjuster.java
index 77c0ca8..fe52738 100755
--- a/src/jalview/appletgui/IdwidthAdjuster.java
+++ b/src/jalview/appletgui/IdwidthAdjuster.java
@@ -1,24 +1,33 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 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.appletgui;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Panel;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
public class IdwidthAdjuster extends Panel implements MouseListener,
MouseMotionListener
@@ -54,6 +63,26 @@ public class IdwidthAdjuster extends Panel implements MouseListener,
{
active = false;
repaint();
+
+ /*
+ * If in a SplitFrame with co-scaled alignments, set the other's id width to
+ * match; note applet does not (yet) store this in ViewStyle
+ */
+ /*
+ * Code disabled for now as it doesn't work, don't know why; idCanvas width
+ * keeps resetting to a previous value (actually two alternating values!)
+ */
+ // final AlignViewportI viewport = ap.getAlignViewport();
+ // if (viewport.getCodingComplement() != null
+ // && viewport.isScaleProteinAsCdna())
+ // {
+ // Dimension d = ap.idPanel.idCanvas.getSize();
+ // SplitFrame sf = ap.alignFrame.getSplitFrame();
+ // final AlignmentPanel otherPanel =
+ // sf.getComplement(ap.alignFrame).alignPanel;
+ // otherPanel.setIdWidth(d.width, d.height);
+ // otherPanel.repaint();
+ // }
}
public void mouseEntered(MouseEvent evt)
@@ -74,13 +103,13 @@ public class IdwidthAdjuster extends Panel implements MouseListener,
Dimension d = ap.idPanel.idCanvas.getSize();
int dif = evt.getX() - oldX;
- if (d.width + dif > 20 || dif > 0)
+ final int newWidth = d.width + dif;
+ if (newWidth > 20 || dif > 0)
{
- ap.setIdWidth(d.width + dif, d.height);
- this.setSize(d.width + dif, getSize().height);
+ ap.setIdWidth(newWidth, d.height);
+ this.setSize(newWidth, getSize().height);
oldX = evt.getX();
}
-
}
public void mouseMoved(MouseEvent evt)