From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 7 Sep 2017 13:19:03 +0000 (+0100)
Subject: Merge branch 'releases/Release_2_10_2b1_Branch' of http://source.jalview.org/git... 
X-Git-Tag: Release_2_10_2b1^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=6af8a1bf63beb54937489a0298eaef5c72bf8c60;hp=9e97dfd4e5386a68b477eced9e2aab5dff28b316;p=jalview.git

Merge branch 'releases/Release_2_10_2b1_Branch' of source.jalview.org/git/jalview into releases/Release_2_10_2b1_Branch
---

diff --git a/help/html/releases.html b/help/html/releases.html
index 830df62..5afe85c 100755
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@ -140,6 +140,11 @@ li:before {
               <!-- JAL-2724 -->Cannot apply annotation based
               colourscheme to all groups in a view
             </li>
+            <li>
+              <!-- JAL-2511 -->IDs don't line up with sequences
+              initially after font size change using the Font chooser or
+              middle-mouse zoom
+            </li>
           </ul>
         </div></td>
     
diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 629767a..ba9fc11 100644
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -230,6 +230,7 @@ public class AlignmentPanel extends GAlignmentPanel implements
     idSpaceFillerPanel1.setPreferredSize(
             new Dimension(10, av.getCharHeight() + fm.getDescent()));
     idwidthAdjuster.invalidate();
+    scalePanelHolder.invalidate();
     getIdPanel().getIdCanvas().gg = null;
     getSeqPanel().seqCanvas.img = null;
     getAnnotationPanel().adjustPanelHeight();