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
After merge
[jalview.git]
/
src
/
jalview
/
gui
/
FontChooser.java
diff --git
a/src/jalview/gui/FontChooser.java
b/src/jalview/gui/FontChooser.java
index
98d3ecb
..
33bb9de
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
@@
-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
@@
-139,7
+139,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,7
+169,7
@@
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
}
\r
}
\r
\r