From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 12 May 2017 14:48:16 +0000 (+0100)
Subject: Merge branch 'features/JAL-2435splitScreenFont' into develop
X-Git-Tag: Release_2_10_2~3^2~91
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=04d19d44b27b66c342e35b8933776b0ca7da9f35;p=jalview.git

Merge branch 'features/JAL-2435splitScreenFont' into develop
---

04d19d44b27b66c342e35b8933776b0ca7da9f35
diff --cc help/helpTOC.xml
index f76da16,83950aa..db47351
--- a/help/helpTOC.xml
+++ b/help/helpTOC.xml
@@@ -24,8 -24,7 +24,9 @@@
  	<tocitem text="Jalview Documentation" target="home" expand="true">
  			<tocitem text="What's new" target="new" expand="true">
  				<tocitem text="Latest Release Notes" target="release"/>
 +				<tocitem text="Groovy Features Counter example" target="groovy.featurescounter"/>
 +				<tocitem text="Omit hidden regions in Overview" target="overview"/>
+ 				<tocitem text="Split Frame View" target="splitframe.mirrorfonts" />
  		</tocitem>
  		
  		<tocitem text="Editing Alignments" target="edit" />
diff --cc src/jalview/appletgui/AlignViewport.java
index 5435d81,ebfd6f0..9629a5f
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@@ -40,8 -39,10 +40,9 @@@ import jalview.structure.SelectionSourc
  import jalview.structure.StructureSelectionManager;
  import jalview.structure.VamsasSource;
  import jalview.viewmodel.AlignmentViewport;
 -import jalview.viewmodel.ViewportRanges;
  
  import java.awt.Font;
+ import java.awt.FontMetrics;
  
  public class AlignViewport extends AlignmentViewport implements
          SelectionSource