git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
[jalview.git]
/
src
/
jalview
/
gui
/
FontChooser.java
diff --git
a/src/jalview/gui/FontChooser.java
b/src/jalview/gui/FontChooser.java
index
f3c8e8f
..
f532706
100755
(executable)
--- a/
src/jalview/gui/FontChooser.java
+++ b/
src/jalview/gui/FontChooser.java
@@
-20,10
+20,6
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import jalview.bin.Cache;
-import jalview.jbgui.GFontChooser;
-import jalview.util.MessageManager;
-
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.geom.Rectangle2D;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.geom.Rectangle2D;
@@
-31,6
+27,10
@@
import java.awt.geom.Rectangle2D;
import javax.swing.JInternalFrame;
import javax.swing.JLayeredPane;
import javax.swing.JInternalFrame;
import javax.swing.JLayeredPane;
+import jalview.bin.Cache;
+import jalview.jbgui.GFontChooser;
+import jalview.util.MessageManager;
+
/**
* DOCUMENT ME!
*
/**
* DOCUMENT ME!
*
@@
-87,7
+87,7
@@
public class FontChooser extends GFontChooser
public FontChooser(TreePanel treePanel)
{
this.tp = treePanel;
public FontChooser(TreePanel treePanel)
{
this.tp = treePanel;
- ap = treePanel.treeCanvas.ap;
+ ap = treePanel.getTreeCanvas().getAssociatedPanel();
oldFont = treePanel.getTreeFont();
defaultButton.setVisible(false);
smoothFont.setEnabled(false);
oldFont = treePanel.getTreeFont();
defaultButton.setVisible(false);
smoothFont.setEnabled(false);
@@
-112,6
+112,7
@@
public class FontChooser extends GFontChooser
void init()
{
frame = new JInternalFrame();
void init()
{
frame = new JInternalFrame();
+ frame.setFrameIcon(null);
frame.setContentPane(this);
smoothFont.setSelected(ap.av.antiAlias);
frame.setContentPane(this);
smoothFont.setSelected(ap.av.antiAlias);
@@
-134,7
+135,7
@@
public class FontChooser extends GFontChooser
fontAsCdna.setSelected(ap.av.isProteinFontAsCdna());
}
fontAsCdna.setSelected(ap.av.isProteinFontAsCdna());
}
- if (tp != null)
+ if (isTreeFont())
{
Desktop.addInternalFrame(frame,
MessageManager.getString("action.change_font_tree_panel"),
{
Desktop.addInternalFrame(frame,
MessageManager.getString("action.change_font_tree_panel"),
@@
-229,7
+230,11
@@
public class FontChooser extends GFontChooser
@Override
protected void cancel_actionPerformed()
{
@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.setFont(oldFont, true);
ap.av.setScaleProteinAsCdna(oldProteinScale);
@@
-250,10
+255,6
@@
public class FontChooser extends GFontChooser
splitFrame.repaint();
}
}
splitFrame.repaint();
}
}
- else if (tp != null)
- {
- tp.setTreeFont(oldFont);
- }
try
{
try
{
@@
-263,6
+264,11
@@
public class FontChooser extends GFontChooser
}
}
}
}
+ private boolean isTreeFont()
+ {
+ return tp != null;
+ }
+
/**
* DOCUMENT ME!
*/
/**
* DOCUMENT ME!
*/
@@
-317,7
+323,7
@@
public class FontChooser extends GFontChooser
}
return;
}
}
return;
}
- if (tp != null)
+ if (isTreeFont())
{
tp.setTreeFont(newFont);
}
{
tp.setTreeFont(newFont);
}