X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=06f29e9dd18f435dae628fb2b2ee7d042a12de33;hb=954039bbfbde3648ac4c795277e788e49be5181b;hp=547f528b6895991803530ceb9a9bf3144793112d;hpb=e3f93aa087ce63e7b557497d1f4563ed4dbe2941;p=jalview.git diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java index 547f528..06f29e9 100755 --- a/src/jalview/gui/FontChooser.java +++ b/src/jalview/gui/FontChooser.java @@ -75,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 * @@ -100,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(); } @@ -122,6 +126,7 @@ public class FontChooser extends GFontChooser { oldComplementFont = ((AlignViewport) ap.av.getCodingComplement()) .getFont(); + oldComplementSmooth = ((AlignViewport) ap.av.getCodingComplement()).antiAlias; scaleAsCdna.setVisible(true); scaleAsCdna.setSelected(ap.av.isScaleProteinAsCdna()); fontAsCdna.setVisible(true); @@ -178,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(); + } + } /** @@ -219,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); + ((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) @@ -322,6 +341,7 @@ public class FontChooser extends GFontChooser */ SplitFrame splitFrame = (SplitFrame) ap.alignFrame .getSplitViewContainer(); + splitFrame.adjustLayout(); splitFrame.repaint(); } }