From 4353b5fc310340ece7067b3872235ab7f844c8c2 Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 26 Oct 2017 15:47:32 +0100
Subject: [PATCH] JAL-2793 cancelling font changed dialog didn't call
 ap.fontChanged() to reset layout

---
 help/html/releases.html          |    4 +++-
 src/jalview/gui/FontChooser.java |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/help/html/releases.html b/help/html/releases.html
index a783656..bf25716 100755
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@ -117,6 +117,7 @@ li:before {
             <li><!-- JAL-2757 -->Can't edit the query after the server error warning icon is shown in Uniprot and PDB Free Text Search Dialogs
             </li> 
             <li><!-- JAL-2253 -->Slow EnsemblGenome ID lookup</li>
+            <li><!-- JAL-2529 -->Revised Ensembl REST API CDNA query</li>
             <li><!-- JAL-2739 -->Hidden column marker in last column not rendered when switching back from Wrapped to normal view</li> 
             <li><!-- JAL-2768 -->Annotation display corrupted when scrolling right in unwapped alignment view</li> 
             <li><!-- JAL-2542 -->Existing features on subsequence incorrectly relocated when full sequence retrieved from database</li> 
@@ -128,7 +129,8 @@ li:before {
             <li><!-- JAL-1900,JAL-1625 -->Unable to minimise windows within the Jalview desktop on OSX</li>
             <li><!-- JAL-2667 -->Mouse wheel doesn't scroll vertically when in wrapped alignment mode</li>
             <li><!-- JAL-2636 -->Scale mark not shown when close to right hand end of alignment</li>
-            <li><!-- JAL-2684 -->Pairwise alignment only aligns selected regions of each selected sequence</li>          
+            <li><!-- JAL-2684 -->Pairwise alignment only aligns selected regions of each selected sequence</li>
+            <li><!-- JAL-2973 -->Alignment ruler height set incorrectly after canceling the Alignment Window's Font dialog</li>          
            </ul>
           <strong><em>Applet</em></strong><br/>
            <ul>
diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 80ac189..f3c8e8f 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -235,7 +235,7 @@ public class FontChooser extends GFontChooser
       ap.av.setScaleProteinAsCdna(oldProteinScale);
       ap.av.setProteinFontAsCdna(oldMirrorFont);
       ap.av.antiAlias = oldSmoothFont;
-      ap.paintAlignment(true, false);
+      ap.fontChanged();
 
       if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled())
       {
-- 
1.7.10.2