From: kiramt <k.mourao@dundee.ac.uk>
Date: Tue, 21 Feb 2017 10:55:07 +0000 (+0000)
Subject: Merge branch 'bug/JAL-2421overviewboxflicker' into
X-Git-Tag: Release_2_10_2~3^2~92^2~68
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=29933a3d76e0a2517ac59307adb40a73204ceacf;p=jalview.git

Merge branch 'bug/JAL-2421overviewboxflicker' into
features/JAL-2388OverviewWindow

Conflicts:
	src/jalview/gui/AlignmentPanel.java
---

29933a3d76e0a2517ac59307adb40a73204ceacf
diff --cc src/jalview/gui/AlignmentPanel.java
index 3e24b94,d793e6a..146df38
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@@ -734,6 -734,7 +734,8 @@@ public class AlignmentPanel extends GAl
        x = 0;
      }
  
++
+     // update endRes after x has (possibly) been adjusted
      av.setEndRes((x + (getSeqPanel().seqCanvas.getWidth() / av
              .getCharWidth())) - 1);