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
JAL-4366 allow a 3di alignment to be loaded and shown as a split frame with existing...
[jalview.git]
/
src
/
jalview
/
gui
/
FontChooser.java
diff --git
a/src/jalview/gui/FontChooser.java
b/src/jalview/gui/FontChooser.java
index
c66f304
..
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);