From: kiramt Date: Wed, 30 Aug 2017 07:11:40 +0000 (+0100) Subject: Merge branch 'feature/JAL-2664' into feature/JAL-2527 X-Git-Tag: Release_2_10_3b1~142^2~2^2~10 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=d9ec1e848018a92a6d0883b13a25038e279e4ee9 Merge branch 'feature/JAL-2664' into feature/JAL-2527 --- d9ec1e848018a92a6d0883b13a25038e279e4ee9 diff --cc src/jalview/datamodel/AllRowsCollection.java index 9a33094,c52cebf..10c47f0 --- a/src/jalview/datamodel/AllRowsCollection.java +++ b/src/jalview/datamodel/AllRowsCollection.java @@@ -59,4 -59,11 +59,10 @@@ public class AllRowsCollection implemen { return alignment.getSequenceAtAbsoluteIndex(seq); } + + @Override + public boolean hasHidden() + { + return (hidden.getSize() > 0); + } } - diff --cc src/jalview/datamodel/VisibleRowsCollection.java index ee0557f,3119017..fd7cf47 --- a/src/jalview/datamodel/VisibleRowsCollection.java +++ b/src/jalview/datamodel/VisibleRowsCollection.java @@@ -56,4 -56,11 +56,10 @@@ public class VisibleRowsCollection impl { return alignment.getSequenceAtAbsoluteIndex(seq); } + + @Override + public boolean hasHidden() + { + return false; + } } - diff --cc src/jalview/renderer/OverviewRenderer.java index 0f8cda6,1fb2d89..2f8f5fe --- a/src/jalview/renderer/OverviewRenderer.java +++ b/src/jalview/renderer/OverviewRenderer.java @@@ -102,11 -106,12 +106,11 @@@ public class OverviewRendere { break; } - + // calculate where this column extends to in pixels - int endCol = Math.min( - Math.round((colIndex + 1) * pixelsPerCol) - 1, + int endCol = Math.min(Math.round((colIndex + 1) * pixelsPerCol) - 1, miniMe.getWidth() - 1); - + // don't do expensive colour determination if we're not going to use it // NB this is important to avoid performance issues in the overview // panel