X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=58569cdcede29dec5ef827800699e38166fd92ab;hb=da1ce6ca071deb35b983a41f6eeed43f30b3c3b2;hp=270b2f73beb374738ce41aee03e1cdb6f734735c;hpb=14193747f3831242bc7dfac12394eb20eb0ba480;p=jalview.git diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java index 270b2f7..58569cd 100644 --- a/src/jalview/appletgui/AlignmentPanel.java +++ b/src/jalview/appletgui/AlignmentPanel.java @@ -46,6 +46,7 @@ import java.awt.event.ComponentEvent; import java.beans.PropertyChangeEvent; import java.util.List; +@SuppressWarnings("serial") public class AlignmentPanel extends Panel implements AdjustmentListener, AlignmentViewPanel, ViewportListenerI { @@ -415,14 +416,14 @@ public class AlignmentPanel extends Panel public boolean scrollTo(int ostart, int end, int seqIndex, boolean scrollToNearest, boolean redrawOverview) { - int startv, endv, starts, ends, width; + int startv, endv, starts, ends;//, width; int start = -1; if (av.hasHiddenColumns()) { AlignmentI al = av.getAlignment(); - start = al.getHiddenColumns().findColumnPosition(ostart); - end = al.getHiddenColumns().findColumnPosition(end); + start = al.getHiddenColumns().absoluteToVisibleColumn(ostart); + end = al.getHiddenColumns().absoluteToVisibleColumn(end); if (start == end) { if (!scrollToNearest && !al.getHiddenColumns().isVisible(ostart)) @@ -669,14 +670,9 @@ public class AlignmentPanel extends Panel } else { - int width = av.getAlignment().getWidth(); + int width = av.getAlignment().getVisibleWidth(); int height = av.getAlignment().getHeight(); - if (av.hasHiddenColumns()) - { - width = av.getAlignment().getHiddenColumns() - .findColumnPosition(width); - } if (x < 0) { x = 0;