Merge branch 'bug/JAL-2778again' into releases/Release_2_10_4_Branch

diff --cc src/jalview/datamodel/Alignment.java
Simple merge

diff --cc src/jalview/gui/AnnotationPanel.java
Simple merge

diff --cc src/jalview/gui/Desktop.java
Simple merge

diff --cc src/jalview/gui/IdCanvas.java
Simple merge

diff --cc src/jalview/gui/ScalePanel.java
index 798c833,b135fc1..cb7f0da
--- 1/src/jalview/gui/ScalePanel.java
--- 2/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@@ -550,11 -552,14 +552,15 @@@ public class ScalePanel extends JPane
      // paint, so scroll events are identified as changes to the horizontal or
      // vertical start value.
      if (evt.getPropertyName().equals(ViewportRanges.STARTRES)
 -            || evt.getPropertyName().equals(ViewportRanges.STARTRESANDSEQ))
 +            || evt.getPropertyName().equals(ViewportRanges.STARTRESANDSEQ)
 +            || evt.getPropertyName().equals(ViewportRanges.MOVE_VIEWPORT))
      {
        // scroll event, repaint panel
-       repaint();
+       
+       // Call repaint on alignment panel so that repaints from other alignment
+     // panel components can be aggregated. Otherwise performance of the overview
+     // window and others may be adversely affected.
+       av.getAlignPanel().repaint();
      }
    }
  

diff --cc src/jalview/gui/SeqCanvas.java
Simple merge