X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=0ed54e7d0024a48cd482ac2505c8b50d6bb9accf;hb=aaac0e1651a09a05ee8c75b56dbf408f53a0ddaa;hp=83d8ade3f12bd4cd1da7664bbf80195719b360ed;hpb=b24a7070977bdbb780ec0a0e218935966af94b65;p=jalview.git diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java index 83d8ade..0ed54e7 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 { @@ -344,7 +345,7 @@ public class AlignmentPanel extends Panel int verticalOffset, boolean redrawOverview, boolean centre) { // do we need to scroll the panel? - if (results != null && results.getSize() > 0) + if (results != null && results.getCount() > 0) { AlignmentI alignment = av.getAlignment(); int seqIndex = alignment.findIndex(results); @@ -415,7 +416,7 @@ 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()) @@ -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() - .absoluteToVisibleColumn(width); - } if (x < 0) { x = 0;