JAL-1807

[jalview.git] / src / jalview / appletgui / FontChooser.java

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index ae59470..f867afa 100644 (file)
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -20,26 +20,27 @@
  */
 package jalview.appletgui;
 
+import jalview.api.ViewStyleI;
+import jalview.bin.JalviewLite;
+import jalview.util.MessageManager;
+
 import java.awt.BorderLayout;
-import java.awt.Button;
-import java.awt.Checkbox;
-import java.awt.Choice;
+import awt2swing.Button;
+import awt2swing.Checkbox;
+import awt2swing.Choice;
 import java.awt.Color;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.FontMetrics;
-import java.awt.Frame;
-import java.awt.Label;
-import java.awt.Panel;
+import awt2swing.Frame;
+import awt2swing.Label;
+import awt2swing.Panel;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
-import jalview.api.ViewStyleI;
-import jalview.util.MessageManager;
-
 /**
  * This dialog allows the user to try different font settings and related
  * options. Changes are immediately visible on the alignment or tree. The user
@@ -151,7 +152,7 @@ public class FontChooser extends Panel implements ItemListener
 
     this.frame = new Frame();
     frame.add(this);
-    jalview.bin.JalviewLite.addFrame(frame,
+    JalviewLite.addFrame(frame,
             MessageManager.getString("action.change_font"), 440, 115);
 
     init = false;
@@ -204,6 +205,13 @@ public class FontChooser extends Panel implements ItemListener
   {
     if (ap != null)
     {
+      ap.av.setScaleProteinAsCdna(oldScaleProtein);
+      if (ap.av.getCodingComplement() != null)
+      {
+        ap.av.getCodingComplement().setScaleProteinAsCdna(oldScaleProtein);
+        ap.alignFrame.getSplitFrame().repaint();
+      }
+
       ap.av.setFont(oldFont);
       ViewStyleI style = ap.av.getViewStyle();
       if (style.getCharWidth() != oldCharWidth)
@@ -390,11 +398,10 @@ public class FontChooser extends Panel implements ItemListener
     optionsPanel.add(stylePanel, null);
 
     /*
-     * Only show 'scale protein as cDNA' in protein half of a SplitFrame
+     * Only show 'scale protein as cDNA' in a SplitFrame
      */
     this.add(optionsPanel, BorderLayout.NORTH);
-    if (ap.alignFrame.getSplitFrame() != null
-            && !ap.av.getAlignment().isNucleotide())
+    if (ap.alignFrame.getSplitFrame() != null)
     {
       this.add(scalePanel, BorderLayout.CENTER);
     }
@@ -408,8 +415,11 @@ public class FontChooser extends Panel implements ItemListener
   protected void scaleAsCdna_actionPerformed()
   {
     ap.av.setScaleProteinAsCdna(scaleAsCdna.getState());
+    ap.av.getCodingComplement().setScaleProteinAsCdna(
+            scaleAsCdna.getState());
     ap.alignFrame.getSplitFrame().adjustLayout();
     ap.paintAlignment(true);
+    ap.alignFrame.getSplitFrame().repaint();
   }
 
 }