public FontChooser(TreePanel treePanel)
{
this.tp = treePanel;
- ap = treePanel.treeCanvas.ap;
+ ap = treePanel.getTreeCanvas().getAssociatedPanel();
oldFont = treePanel.getTreeFont();
defaultButton.setVisible(false);
smoothFont.setEnabled(false);
fontAsCdna.setSelected(ap.av.isProteinFontAsCdna());
}
- if (tp != null)
+ if (isTreeFont())
{
Desktop.addInternalFrame(frame,
MessageManager.getString("action.change_font_tree_panel"),
{
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
{
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();
}
}
}
@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())
{
splitFrame.repaint();
}
}
- else if (tp != null)
- {
- tp.setTreeFont(oldFont);
- }
try
{
}
}
+ private boolean isTreeFont()
+ {
+ return tp != null;
+ }
+
/**
* DOCUMENT ME!
*/
}
return;
}
- if (tp != null)
+ if (isTreeFont())
{
tp.setTreeFont(newFont);
}
@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()));