X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=a8f3b24922fb9193a1ff9f6158291894cf93708a;hb=36c3c5a0883c68bb8b007bb392668977331f9f1a;hp=cfbc403e42e5980927da36aae8f73898296350c4;hpb=bef980d8536bd7da240abcbf357e3ed3b064b523;p=jalview.git diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index cfbc403..a8f3b24 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -153,7 +153,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI * @param vertical * DOCUMENT ME! */ - public void fastPaint(int vertical, boolean isresize) + public void fastPaint(int vertical) { if (gg == null) { @@ -171,37 +171,26 @@ public class IdCanvas extends JPanel implements ViewportListenerI int es = ranges.getEndSeq(); int transY = 0; - if (isresize) + if (vertical > 0) // scroll down { - if (vertical != 0) + ss = es - vertical; + + if (ss < ranges.getStartSeq()) + { // ie scrolling too fast, more than a page at a time + ss = ranges.getStartSeq(); + } + else { transY = imgHeight - ((vertical + 1) * av.getCharHeight()); - ss = es - vertical - ss; } } - else + else if (vertical < 0) // scroll up { - if (vertical > 0) // scroll down - { - ss = es - vertical; + es = ss - vertical; - if (ss < ranges.getStartSeq()) - { // ie scrolling too fast, more than a page at a time - ss = ranges.getStartSeq(); - } - else - { - transY = imgHeight - ((vertical + 1) * av.getCharHeight()); - } - } - else if (vertical < 0) // scroll up + if (es > ranges.getEndSeq()) { - es = ss - vertical; - - if (es > ranges.getEndSeq()) - { - es = ranges.getEndSeq(); - } + es = ranges.getEndSeq(); } } @@ -537,11 +526,11 @@ public class IdCanvas extends JPanel implements ViewportListenerI // Respond to viewport range changes (e.g. alignment panel was scrolled) if (evt.getPropertyName().equals("startseq")) { - fastPaint((int) evt.getNewValue() - (int) evt.getOldValue(), false); + fastPaint((int) evt.getNewValue() - (int) evt.getOldValue()); } else if (evt.getPropertyName().equals("endseq")) { - fastPaint((int) evt.getNewValue() - (int) evt.getOldValue(), true); + // resize - do nothing } } }