X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=80ac189eaf1f0c4263b427e11223feea1b8ea5bf;hb=106a3890f956e2aa7780b2985f4326655912a558;hp=fdf3d2adc7e73f04214818983c8766f43826e029;hpb=8181358395df043e2554381f84229cc0e0323011;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index fdf3d2a..80ac189 100755
--- 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,10 @@ 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);
@@ -157,9 +171,9 @@ public class FontChooser extends GFontChooser
     fontStyle.setSelectedIndex(oldFont.getStyle());
 
     FontMetrics fm = getGraphics().getFontMetrics(oldFont);
-    monospaced.setSelected(fm.getStringBounds("M", getGraphics())
-            .getWidth() == fm.getStringBounds("|", getGraphics())
-            .getWidth());
+    monospaced.setSelected(
+            fm.getStringBounds("M", getGraphics()).getWidth() == fm
+                    .getStringBounds("|", getGraphics()).getWidth());
 
     init = false;
   }
@@ -169,7 +183,16 @@ public class FontChooser extends GFontChooser
   {
     ap.av.antiAlias = smoothFont.isSelected();
     ap.getAnnotationPanel().image = null;
-    ap.paintAlignment(true);
+    ap.paintAlignment(true, false);
+    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 +234,20 @@ public class FontChooser extends GFontChooser
       ap.av.setFont(oldFont, true);
       ap.av.setScaleProteinAsCdna(oldProteinScale);
       ap.av.setProteinFontAsCdna(oldMirrorFont);
-      ap.paintAlignment(true);
+      ap.av.antiAlias = oldSmoothFont;
+      ap.paintAlignment(true, false);
 
       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)
@@ -257,8 +287,9 @@ public class FontChooser extends GFontChooser
     double iw = iBounds.getWidth();
     if (mw < 1 || iw < 1)
     {
-      String message = iBounds.getHeight() < 1 ? MessageManager
-              .getString("label.font_doesnt_have_letters_defined")
+      String message = iBounds.getHeight() < 1
+              ? MessageManager
+                      .getString("label.font_doesnt_have_letters_defined")
               : MessageManager.getString("label.font_too_small");
       JvOptionPane.showInternalMessageDialog(this, message,
               MessageManager.getString("label.invalid_font"),
@@ -271,8 +302,8 @@ public class FontChooser extends GFontChooser
       {
         fontSize.setSelectedItem(lastSelected.getSize());
       }
-      if (!lastSelected.getName().equals(
-              fontName.getSelectedItem().toString()))
+      if (!lastSelected.getName()
+              .equals(fontName.getSelectedItem().toString()))
       {
         fontName.setSelectedItem(lastSelected.getName());
       }
@@ -296,27 +327,21 @@ public class FontChooser extends GFontChooser
       ap.fontChanged();
 
       /*
-       * adjust other half of split frame if any, if either same
-       * font, or proportionate scaling, is selected
+       * adjust other half of split frame if present, whether or not same font or
+       * scale to cDNA is selected, because a font change may affect character
+       * width, and this is kept the same in both panels
        */
-      if (fontAsCdna.isEnabled())
+      if (fontAsCdna.isVisible())
       {
         if (fontAsCdna.isSelected())
         {
-          /*
-           * copy the font
-           */
           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();
-        }
+
+        SplitFrame splitFrame = (SplitFrame) ap.alignFrame
+                .getSplitViewContainer();
+        splitFrame.adjustLayout();
+        splitFrame.repaint();
       }
     }
 
@@ -395,8 +420,8 @@ public class FontChooser extends GFontChooser
   protected void scaleAsCdna_actionPerformed()
   {
     ap.av.setScaleProteinAsCdna(scaleAsCdna.isSelected());
-    ap.av.getCodingComplement().setScaleProteinAsCdna(
-            scaleAsCdna.isSelected());
+    ap.av.getCodingComplement()
+            .setScaleProteinAsCdna(scaleAsCdna.isSelected());
     final SplitFrame splitFrame = (SplitFrame) ap.alignFrame
             .getSplitViewContainer();
     splitFrame.adjustLayout();
@@ -405,8 +430,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 +440,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();
   }
 }