JAL-3383 JAL-3253-applet bug in FontChooser calls for full redraw;

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

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 06f29e9..9bb133c 100755 (executable)
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -87,7 +87,7 @@ public class FontChooser extends GFontChooser
   public FontChooser(TreePanel treePanel)
   {
     this.tp = treePanel;
-    ap = treePanel.treeCanvas.ap;
+    ap = treePanel.getTreeCanvas().getAssociatedPanel();
     oldFont = treePanel.getTreeFont();
     defaultButton.setVisible(false);
     smoothFont.setEnabled(false);
@@ -126,14 +126,15 @@ public class FontChooser extends GFontChooser
     {
       oldComplementFont = ((AlignViewport) ap.av.getCodingComplement())
               .getFont();
-      oldComplementSmooth = ((AlignViewport) ap.av.getCodingComplement()).antiAlias;
+      oldComplementSmooth = ((AlignViewport) ap.av
+              .getCodingComplement()).antiAlias;
       scaleAsCdna.setVisible(true);
       scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna());
       fontAsCdna.setVisible(true);
       fontAsCdna.setSelected(ap.av.isProteinFontAsCdna());
     }
 
-    if (tp != null)
+    if (isTreeFont())
     {
       Desktop.addInternalFrame(frame,
               MessageManager.getString("action.change_font_tree_panel"),
@@ -170,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;
   }
@@ -182,10 +183,11 @@ 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;
+      ((AlignViewport) ap.av
+              .getCodingComplement()).antiAlias = ap.av.antiAlias;
       SplitFrame sv = (SplitFrame) ap.alignFrame.getSplitViewContainer();
       sv.adjustLayout();
       sv.repaint();
@@ -213,7 +215,11 @@ public class FontChooser extends GFontChooser
     {
       if (ap.getOverviewPanel() != null)
       {
-        ap.getOverviewPanel().updateOverviewImage();
+        // changes size of rectangle
+        // BH 2019.07.29 -- updateOverviewImage forces a redraw, but all we are
+        // doing is changing the box size.
+
+        ap.getOverviewPanel().repaint();// updateOverviewImage();
       }
     }
   }
@@ -227,19 +233,24 @@ public class FontChooser extends GFontChooser
   @Override
   protected void cancel_actionPerformed()
   {
-    if (ap != null)
+    if (isTreeFont())
+    {
+      tp.setTreeFont(oldFont);
+    }
+    else if (ap != null)
     {
       ap.av.setFont(oldFont, true);
       ap.av.setScaleProteinAsCdna(oldProteinScale);
       ap.av.setProteinFontAsCdna(oldMirrorFont);
       ap.av.antiAlias = oldSmoothFont;
-      ap.paintAlignment(true);
+      ap.fontChanged();
 
       if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled())
       {
         ap.av.getCodingComplement().setScaleProteinAsCdna(oldProteinScale);
         ap.av.getCodingComplement().setProteinFontAsCdna(oldMirrorFont);
-        ((AlignViewport) ap.av.getCodingComplement()).antiAlias = oldComplementSmooth;
+        ((AlignViewport) ap.av
+                .getCodingComplement()).antiAlias = oldComplementSmooth;
         ap.av.getCodingComplement().setFont(oldComplementFont, true);
         SplitFrame splitFrame = (SplitFrame) ap.alignFrame
                 .getSplitViewContainer();
@@ -247,10 +258,6 @@ public class FontChooser extends GFontChooser
         splitFrame.repaint();
       }
     }
-    else if (tp != null)
-    {
-      tp.setTreeFont(oldFont);
-    }
 
     try
     {
@@ -260,6 +267,11 @@ public class FontChooser extends GFontChooser
     }
   }
 
+  private boolean isTreeFont()
+  {
+    return tp != null;
+  }
+
   /**
    * DOCUMENT ME!
    */
@@ -284,8 +296,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"),
@@ -298,8 +311,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());
       }
@@ -313,7 +326,7 @@ public class FontChooser extends GFontChooser
       }
       return;
     }
-    if (tp != null)
+    if (isTreeFont())
     {
       tp.setTreeFont(newFont);
     }
@@ -323,22 +336,17 @@ 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);
         }
 
-        /*
-         * adjust layout for font change / reset / sizing
-         */
         SplitFrame splitFrame = (SplitFrame) ap.alignFrame
                 .getSplitViewContainer();
         splitFrame.adjustLayout();
@@ -404,10 +412,10 @@ public class FontChooser extends GFontChooser
   @Override
   public void defaultButton_actionPerformed()
   {
-    Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString());
-    Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex() + "");
-    Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString());
-    Cache.setProperty("ANTI_ALIAS",
+    Cache.setProperty(Preferences.FONT_NAME, fontName.getSelectedItem().toString());
+    Cache.setProperty(Preferences.FONT_STYLE, fontStyle.getSelectedIndex() + "");
+    Cache.setProperty(Preferences.FONT_SIZE, fontSize.getSelectedItem().toString());
+    Cache.setProperty(Preferences.ANTI_ALIAS,
             Boolean.toString(smoothFont.isSelected()));
     Cache.setProperty(Preferences.SCALE_PROTEIN_TO_CDNA,
             Boolean.toString(scaleAsCdna.isSelected()));
@@ -421,8 +429,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();