X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=9b2be4cd2975997ba091bceef62563912dcae7f3;hb=c075b7f23933cbb3c6b1dda53d249d8cbefbe0b6;hp=1749e23ee37d74d799e0585e6702b874a10dd46e;hpb=3b5fd72d019a6cd71f611b4110651ff6b62ce5bf;p=jalview.git diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index 1749e23..9b2be4c 100755 --- a/src/jalview/appletgui/OverviewPanel.java +++ b/src/jalview/appletgui/OverviewPanel.java @@ -265,7 +265,8 @@ public class OverviewPanel extends Panel implements Runnable, { miniMe = null; int alwidth = av.getAlignment().getWidth(); - int alheight = av.getAlignment().getHeight(); + int alheight = av.getAlignment().getHeight() + + av.getAlignment().getHiddenSequences().getSize(); if (av.isShowSequenceFeatures()) { @@ -298,10 +299,16 @@ public class OverviewPanel extends Panel implements Runnable, Color color = Color.yellow; int row, col, sameRow = 0, sameCol = 0; jalview.datamodel.SequenceI seq; + final boolean hasHiddenRows = av.hasHiddenRows(), hasHiddenCols = av + .hasHiddenColumns(); boolean hiddenRow = false; AlignmentI alignment = av.getAlignment(); for (row = 0; row <= sequencesHeight; row++) { + if (resizeAgain) + { + break; + } if ((int) (row * sampleRow) == lastrow) { sameRow++; @@ -309,7 +316,7 @@ public class OverviewPanel extends Panel implements Runnable, } hiddenRow = false; - if (av.hasHiddenRows()) + if (hasHiddenRows) { seq = alignment.getHiddenSequences().getHiddenSequence(lastrow); if (seq == null) @@ -355,8 +362,8 @@ public class OverviewPanel extends Panel implements Runnable, } if (hiddenRow - || (av.hasHiddenColumns() && !av.getColumnSelection() - .isVisible(lastcol))) + || (hasHiddenCols && !av.getColumnSelection().isVisible( + lastcol))) { color = color.darker().darker(); } @@ -383,6 +390,10 @@ public class OverviewPanel extends Panel implements Runnable, { for (col = 0; col < width; col++) { + if (resizeAgain) + { + break; + } lastcol = (int) (col * sampleCol); { mg.translate(col, sequencesHeight);