X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=80ac189eaf1f0c4263b427e11223feea1b8ea5bf;hb=a57976ba40e1abe6d7c1940386e1a25419ef9c9d;hp=5271e4f73667d6b8080078879f763481cf6f2f7d;hpb=3d0101179759ef157b088ea135423cd909512d9f;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 5271e4f..80ac189 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -183,7 +183,7 @@ 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 @@ -235,7 +235,7 @@ public class FontChooser extends GFontChooser ap.av.setScaleProteinAsCdna(oldProteinScale); ap.av.setProteinFontAsCdna(oldMirrorFont); ap.av.antiAlias = oldSmoothFont; - ap.paintAlignment(true); + ap.paintAlignment(true, false); if (scaleAsCdna.isVisible() && scaleAsCdna.isEnabled()) { @@ -327,22 +327,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();