Merge branch 'documentation/JAL-2418_release2102' into develop

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

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index fdf3d2a..06f29e9 100755 (executable)
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -49,6 +49,12 @@ public class FontChooser extends GFontChooser
   Font oldFont;
 
   /*
+   * The font on opening the dialog (to be restored on Cancel)
+   * on the other half of a split frame (if applicable)
+   */
+  Font oldComplementFont;
+
+  /*
    * the state of 'scale protein as cDNA' on opening the dialog
    */
   boolean oldProteinScale;
@@ -69,6 +75,10 @@ public class FontChooser extends GFontChooser
 
   private boolean lastSelMono = false;
 
+  private boolean oldSmoothFont;
+
+  private boolean oldComplementSmooth;
+
   /**
    * Creates a new FontChooser for a tree panel
    * 
@@ -94,7 +104,7 @@ public class FontChooser extends GFontChooser
     oldFont = alignPanel.av.getFont();
     oldProteinScale = alignPanel.av.isScaleProteinAsCdna();
     oldMirrorFont = alignPanel.av.isProteinFontAsCdna();
-
+    oldSmoothFont = alignPanel.av.antiAlias;
     this.ap = alignPanel;
     init();
   }
@@ -114,6 +124,9 @@ public class FontChooser extends GFontChooser
     boolean inSplitFrame = ap.av.getCodingComplement() != null;
     if (inSplitFrame)
     {
+      oldComplementFont = ((AlignViewport) ap.av.getCodingComplement())
+              .getFont();
+      oldComplementSmooth = ((AlignViewport) ap.av.getCodingComplement()).antiAlias;
       scaleAsCdna.setVisible(true);
       scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna());
       fontAsCdna.setVisible(true);
@@ -170,6 +183,14 @@ public class FontChooser extends GFontChooser
     ap.av.antiAlias = smoothFont.isSelected();
     ap.getAnnotationPanel().image = null;
     ap.paintAlignment(true);
+    if (ap.av.getCodingComplement() != null && ap.av.isProteinFontAsCdna())
+    {
+      ((AlignViewport) ap.av.getCodingComplement()).antiAlias = ap.av.antiAlias;
+      SplitFrame sv = (SplitFrame) ap.alignFrame.getSplitViewContainer();
+      sv.adjustLayout();
+      sv.repaint();
+    }
+
   }
 
   /**
@@ -211,13 +232,19 @@ public class FontChooser extends GFontChooser
       ap.av.setFont(oldFont, true);
       ap.av.setScaleProteinAsCdna(oldProteinScale);
       ap.av.setProteinFontAsCdna(oldMirrorFont);
+      ap.av.antiAlias = oldSmoothFont;
       ap.paintAlignment(true);
 
       if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled())
       {
         ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale);
         ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont);
-        ap.av.getCodingComplement().setFont(oldFont, true);
+        ((AlignViewport) ap.av.getCodingComplement()).antiAlias = oldComplementSmooth;
+        ap.av.getCodingComplement().setFont(oldComplementFont, true);
+        SplitFrame splitFrame = (SplitFrame) ap.alignFrame
+                .getSplitViewContainer();
+        splitFrame.adjustLayout();
+        splitFrame.repaint();
       }
     }
     else if (tp != null)
@@ -308,15 +335,14 @@ public class FontChooser extends GFontChooser
            */
           ap.av.getCodingComplement().setFont(newFont, true);
         }
-        if (fontAsCdna.isSelected() || scaleAsCdna.isSelected())
-        {
-          /*
-           * adjust layout for font change and/or sizing
-           */
-          SplitFrame splitFrame = (SplitFrame) ap.alignFrame
-                  .getSplitViewContainer();
-          splitFrame.repaint();
-        }
+
+        /*
+         * adjust layout for font change / reset / sizing
+         */
+        SplitFrame splitFrame = (SplitFrame) ap.alignFrame
+                .getSplitViewContainer();
+        splitFrame.adjustLayout();
+        splitFrame.repaint();
       }
     }
 
@@ -405,8 +431,8 @@ public class FontChooser extends GFontChooser
 
   /**
    * Turn on/off mirroring of font across split frame. If turning on, also
-   * copies the current font across the split frame. If turning off, does not
-   * change fonts.
+   * copies the current font across the split frame. If turning off, restores
+   * the other half of the split frame to its initial font.
    */
   @Override
   protected void mirrorFonts_actionPerformed()
@@ -415,9 +441,14 @@ public class FontChooser extends GFontChooser
     ap.av.setProteinFontAsCdna(selected);
     ap.av.getCodingComplement().setProteinFontAsCdna(selected);
 
-    if (selected)
+    /*
+     * reset other half of split frame if turning option off
+     */
+    if (!selected)
     {
-      changeFont();
+      ap.av.getCodingComplement().setFont(oldComplementFont, true);
     }
+
+    changeFont();
   }
 }