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-3633 Help documentation updated
[jalview.git]
/
src
/
jalview
/
appletgui
/
FontChooser.java
diff --git
a/src/jalview/appletgui/FontChooser.java
b/src/jalview/appletgui/FontChooser.java
index
991fb96
..
8b74e32
100644
(file)
--- a/
src/jalview/appletgui/FontChooser.java
+++ b/
src/jalview/appletgui/FontChooser.java
@@
-31,9
+31,9
@@
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Frame;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Frame;
+import java.awt.GraphicsEnvironment;
import java.awt.Label;
import java.awt.Panel;
import java.awt.Label;
import java.awt.Panel;
-import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
@@
-144,7
+144,9
@@
public class FontChooser extends Panel implements ItemListener
*/
void init()
{
*/
void init()
{
- String fonts[] = Toolkit.getDefaultToolkit().getFontList();
+ // String fonts[] = Toolkit.getDefaultToolkit().getFontList();
+ String fonts[] = GraphicsEnvironment.getLocalGraphicsEnvironment()
+ .getAvailableFontFamilyNames();
for (int i = 0; i < fonts.length; i++)
{
fontName.addItem(fonts[i]);
for (int i = 0; i < fonts.length; i++)
{
fontName.addItem(fonts[i]);
@@
-261,7
+263,7
@@
public class FontChooser extends Panel implements ItemListener
{
ap.av.setCharWidth(oldCharWidth);
}
{
ap.av.setCharWidth(oldCharWidth);
}
- ap.paintAlignment(true);
+ ap.paintAlignment(true, false);
}
else if (tp != null)
{
}
else if (tp != null)
{
@@
-290,11
+292,11
@@
public class FontChooser extends Panel implements ItemListener
}
Font newFont = new Font(fontName.getSelectedItem().toString(),
}
Font newFont = new Font(fontName.getSelectedItem().toString(),
- fontStyle.getSelectedIndex(), Integer.parseInt(fontSize
- .getSelectedItem().toString()));
+ fontStyle.getSelectedIndex(),
+ Integer.parseInt(fontSize.getSelectedItem().toString()));
FontMetrics fm = getGraphics().getFontMetrics(newFont);
FontMetrics fm = getGraphics().getFontMetrics(newFont);
- double mw = fm.getStringBounds("M", getGraphics()).getWidth(), iw = fm
- .getStringBounds("I", getGraphics()).getWidth();
+ double mw = fm.getStringBounds("M", getGraphics()).getWidth(),
+ iw = fm.getStringBounds("I", getGraphics()).getWidth();
if (mw < 1 || iw < 1)
{
// TODO: JAL-1100
if (mw < 1 || iw < 1)
{
// TODO: JAL-1100
@@
-481,8
+483,8
@@
public class FontChooser extends Panel implements ItemListener
protected void scaleAsCdna_actionPerformed()
{
ap.av.setScaleProteinAsCdna(scaleAsCdna.getState());
protected void scaleAsCdna_actionPerformed()
{
ap.av.setScaleProteinAsCdna(scaleAsCdna.getState());
- ap.av.getCodingComplement().setScaleProteinAsCdna(
- scaleAsCdna.getState());
+ ap.av.getCodingComplement()
+ .setScaleProteinAsCdna(scaleAsCdna.getState());
changeFont();
}
changeFont();
}