X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=02ad0cd285473d6bd24ddef1ade55867197109c3;hb=53a90a961a55fad88199165bdc4c665ba90c28b3;hp=98f44c6078b1ebffc6955d1c10df6945afd64cfc;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index 98f44c6..02ad0cd 100644
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -6,14 +6,16 @@
*
* 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;
@@ -433,7 +435,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
{
annotationSpaceFillerHolder.setVisible(b);
annotationPanelHolder.setVisible(b);
- } else {
+ }
+ else
+ {
annotationSpaceFillerHolder.setVisible(false);
annotationPanelHolder.setVisible(false);
}
@@ -484,10 +488,12 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
if (adjustPanelHeight)
{
- // NOTE: this logic is different in the application. Need a better algorithm to define behaviour
+ // NOTE: this logic is different in the application. Need a better
+ // algorithm to define behaviour
// sets initial preferred height
// try and set height according to alignment
- float sscaling = (float) ((av.getCharHeight() * av.getAlignment().getHeight())/(1.0*mheight));
+ float sscaling = (float) ((av.getCharHeight() * av.getAlignment()
+ .getHeight()) / (1.0 * mheight));
if (sscaling > 0.5)
{
// if the alignment is too big then
@@ -496,7 +502,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
else
{
- // otherwise just set the panel so that one row of sequence is visible
+ // otherwise just set the panel so that one row of sequence is visible
height = -av.getCharHeight() * 1
+ (int) (seqandannot * (1 - sscaling));
}
@@ -547,13 +553,13 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
annotationPanelHolder.setVisible(true);
annotationSpaceFillerHolder.setVisible(true);
}
-
+
idSpaceFillerPanel1.setVisible(!wrap);
fontChanged(); // This is so that the scalePanel is resized correctly
validate();
- sequenceHolderPanel.revalidate();
+ sequenceHolderPanel.validate();
repaint();
}
@@ -823,7 +829,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
seqPanel.seqCanvas.repaint();
idPanel.idCanvas.repaint();
- if (!av.wrapAlignment)
+ if (!av.wrapAlignment)
{
if (av.showAnnotation)
{
@@ -832,7 +838,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener,
}
scalePanel.repaint();
}
-
+
}
protected Panel sequenceHolderPanel = new Panel();