X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=a134afa67367e7bd49ecd2428c2dd68cf8eadf65;hb=9ba5a485b66e9c5a86b12dedc7b32616f3ef6db8;hp=fdad32bd58d3f6d7a4fa76a656fa7f1dcc0f29d9;hpb=76b5df40b2ae218a21d54b30bf726684fe660971;p=jalview.git

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index fdad32b..a134afa 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -277,7 +277,7 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
    * @param vertical
    *          shift up or down in repaint
    */
-  public void fastPaint(int horizontal, int vertical, boolean isresize)
+  public void fastPaint(int horizontal, int vertical)
   {
     if (fastpainting || gg == null)
     {
@@ -295,68 +295,38 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
     int transX = 0;
     int transY = 0;
 
-    if (isresize)
-    {
-      imgWidth = getWidth();
-      imgHeight = getHeight();
-
-      imgWidth -= (imgWidth % charWidth);
-      imgHeight -= (imgHeight % charHeight);
-
-      BufferedImage newimg = new BufferedImage(imgWidth, imgHeight,
-              BufferedImage.TYPE_INT_ARGB);
+    gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
+            imgHeight, -horizontal * charWidth, -vertical * charHeight);
 
-      gg = (Graphics2D) newimg.getGraphics();
-      gg.setFont(av.getFont());
-      gg.drawImage(img, null, 0, 0);
-      img = newimg;
+    if (horizontal > 0) // scrollbar pulled right, image to the left
+    {
+      transX = (er - sr - horizontal) * charWidth;
+      sr = er - horizontal;
+    }
+    else if (horizontal < 0)
+    {
+      er = sr - horizontal;
+    }
+    else if (vertical > 0) // scroll down
+    {
+      ss = es - vertical;
 
-      if (horizontal != 0)
-      {
-        transX = (er - horizontal - sr) * charWidth;
-        sr = er - horizontal - sr;
+      if (ss < ranges.getStartSeq())
+      { // ie scrolling too fast, more than a page at a time
+        ss = ranges.getStartSeq();
       }
-      else if (vertical != 0)
+      else
       {
         transY = imgHeight - ((vertical + 1) * charHeight);
-        ss = es - vertical - ss;
       }
     }
-    else
+    else if (vertical < 0)
     {
-      gg.copyArea(horizontal * charWidth, vertical * charHeight, imgWidth,
-              imgHeight, -horizontal * charWidth, -vertical * charHeight);
+      es = ss - vertical;
 
-      if (horizontal > 0) // scrollbar pulled right, image to the left
-      {
-        transX = (er - sr - horizontal) * charWidth;
-        sr = er - horizontal;
-      }
-      else if (horizontal < 0)
-      {
-        er = sr - horizontal;
-      }
-      else if (vertical > 0) // scroll down
-      {
-        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) * charHeight);
-        }
-      }
-      else if (vertical < 0)
+      if (es > ranges.getEndSeq())
       {
-        es = ss - vertical;
-
-        if (es > ranges.getEndSeq())
-        {
-          es = ranges.getEndSeq();
-        }
+        es = ranges.getEndSeq();
       }
     }
 
@@ -525,6 +495,9 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
 
     FontMetrics fm = getFontMetrics(av.getFont());
 
+    LABEL_EAST = 0;
+    LABEL_WEST = 0;
+
     if (av.getScaleRightWrapped())
     {
       LABEL_EAST = fm.stringWidth(getMask());
@@ -546,16 +519,16 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
 
     av.setWrappedWidth(cWidth);
 
-    av.getRanges().setEndRes(av.getRanges().getStartRes() + cWidth - 1);
+    av.getRanges().setViewportStartAndWidth(startRes, cWidth);
 
     int endx;
     int ypos = hgap;
-    int maxwidth = av.getAlignment().getWidth() - 1;
+    int maxwidth = av.getAlignment().getWidth();
 
     if (av.hasHiddenColumns())
     {
       maxwidth = av.getAlignment().getHiddenColumns()
-              .findColumnPosition(maxwidth) - 1;
+              .findColumnPosition(maxwidth);
     }
 
     while ((ypos <= canvasHeight) && (startRes < maxwidth))
@@ -1018,42 +991,49 @@ public class SeqCanvas extends JComponent implements ViewportListenerI
   @Override
   public void propertyChange(PropertyChangeEvent evt)
   {
-    if (!av.getWrapAlignment())
+    String eventName = evt.getPropertyName();
+
+    if (av.getWrapAlignment())
     {
-      if (evt.getPropertyName().equals("startres"))
+      if (eventName.equals(ViewportRanges.STARTRES))
+      {
+        repaint();
+      }
+    }
+    else
+    {
+      int scrollX = 0;
+      if (eventName.equals(ViewportRanges.STARTRES))
       {
-        // scroll - startres and endres both change
-
         // Make sure we're not trying to draw a panel
         // larger than the visible window
         ViewportRanges vpRanges = av.getRanges();
-        int scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
-        if (scrollX > vpRanges.getEndRes() - vpRanges.getStartRes())
+        scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
+        int range = vpRanges.getEndRes() - vpRanges.getStartRes();
+        if (scrollX > range)
         {
-          scrollX = vpRanges.getEndRes() - vpRanges.getStartRes();
+          scrollX = range;
         }
-        else if (scrollX < vpRanges.getStartRes() - vpRanges.getEndRes())
+        else if (scrollX < -range)
         {
-          scrollX = vpRanges.getStartRes() - vpRanges.getEndRes();
+          scrollX = -range;
         }
-        fastPaint(scrollX, 0, false);
       }
-      else if (evt.getPropertyName().equals("endres"))
+
+      // Both scrolling and resizing change viewport ranges: scrolling changes
+      // both start and end points, but resize only changes end values.
+      // Here we only want to fastpaint on a scroll, with resize using a normal
+      // paint, so scroll events are identified as changes to the horizontal or
+      // vertical start value.
+      if (eventName.equals(ViewportRanges.STARTRES))
       {
-        // resize - only endres changes
-        int scrollX = (int) evt.getNewValue() - (int) evt.getOldValue();
-        fastPaint(scrollX, 0, true);
+        // scroll - startres and endres both change
+        fastPaint(scrollX, 0);
       }
-      else if (evt.getPropertyName().equals("startseq"))
+      else if (eventName.equals(ViewportRanges.STARTSEQ))
       {
         // scroll
-        fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue(), false);
-      }
-      else if (evt.getPropertyName().equals("endseq"))
-      {
-        // resize
-        fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue(),
-                true);
+        fastPaint(0, (int) evt.getNewValue() - (int) evt.getOldValue());
       }
     }
   }