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
doco writing.
[jalview.git]
/
src
/
jalview
/
gui
/
FontChooser.java
diff --git
a/src/jalview/gui/FontChooser.java
b/src/jalview/gui/FontChooser.java
index
98d3ecb
..
6eab36b
100755
(executable)
--- a/
src/jalview/gui/FontChooser.java
+++ b/
src/jalview/gui/FontChooser.java
@@
-50,7
+50,7
@@
public class FontChooser extends GFontChooser
public FontChooser(TreePanel tp)
\r
{
\r
this.tp = tp;
\r
public FontChooser(TreePanel tp)
\r
{
\r
this.tp = tp;
\r
- oldFont = tp.getFont();
\r
+ oldFont = tp.getTreeFont();
\r
defaultButton.setVisible(false);
\r
init();
\r
}
\r
defaultButton.setVisible(false);
\r
init();
\r
}
\r
@@
-71,9
+71,9
@@
public class FontChooser extends GFontChooser
frame = new JInternalFrame();
\r
frame.setContentPane(this);
\r
if(tp!=null)
\r
frame = new JInternalFrame();
\r
frame.setContentPane(this);
\r
if(tp!=null)
\r
- Desktop.addInternalFrame(frame, "Change Font (Tree Panel)", 480, 100, false);
\r
+ Desktop.addInternalFrame(frame, "Change Font (Tree Panel)", 540, 100, false);
\r
else
\r
else
\r
- Desktop.addInternalFrame(frame, "Change Font", 480, 100, false);
\r
+ Desktop.addInternalFrame(frame, "Change Font", 540, 100, false);
\r
\r
frame.setLayer(JLayeredPane.PALETTE_LAYER);
\r
\r
\r
frame.setLayer(JLayeredPane.PALETTE_LAYER);
\r
\r
@@
-85,7
+85,7
@@
public class FontChooser extends GFontChooser
fontName.addItem(fonts[i]);
\r
}
\r
\r
fontName.addItem(fonts[i]);
\r
}
\r
\r
- for (int i = 1; i < 31; i++)
\r
+ for (int i = 1; i < 51; i++)
\r
{
\r
fontSize.addItem(i + "");
\r
}
\r
{
\r
fontSize.addItem(i + "");
\r
}
\r
@@
-98,6
+98,11
@@
public class FontChooser extends GFontChooser
fontSize.setSelectedItem(oldFont.getSize() + "");
\r
fontStyle.setSelectedIndex(oldFont.getStyle());
\r
\r
fontSize.setSelectedItem(oldFont.getSize() + "");
\r
fontStyle.setSelectedIndex(oldFont.getStyle());
\r
\r
+ FontMetrics fm = getGraphics().getFontMetrics(oldFont);
\r
+ monospaced.setSelected( fm.getStringBounds("M",getGraphics()).getWidth()
\r
+ ==fm.getStringBounds("|",getGraphics()).getWidth());
\r
+
\r
+
\r
init = false;
\r
}
\r
\r
init = false;
\r
}
\r
\r
@@
-139,7
+144,7
@@
public class FontChooser extends GFontChooser
}
\r
else if(tp!=null)
\r
{
\r
}
\r
else if(tp!=null)
\r
{
\r
- tp.setFont(oldFont);
\r
+ tp.setTreeFont(oldFont);
\r
}
\r
fontName.setSelectedItem(oldFont.getName());
\r
fontSize.setSelectedItem(oldFont.getSize() + "");
\r
}
\r
fontName.setSelectedItem(oldFont.getName());
\r
fontSize.setSelectedItem(oldFont.getSize() + "");
\r
@@
-169,8
+174,14
@@
public class FontChooser extends GFontChooser
}
\r
else if(tp != null)
\r
{
\r
}
\r
else if(tp != null)
\r
{
\r
- tp.setFont(newFont);
\r
+ tp.setTreeFont(newFont);
\r
}
\r
}
\r
+
\r
+ FontMetrics fm = getGraphics().getFontMetrics(newFont);
\r
+
\r
+ monospaced.setSelected( fm.getStringBounds("M",getGraphics()).getWidth()
\r
+ ==fm.getStringBounds("|",getGraphics()).getWidth());
\r
+
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r