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-2773 add new flag to paintAlignment(updateOverview,updateStructures) and first...
[jalview.git]
/
src
/
jalview
/
appletgui
/
FontChooser.java
diff --git
a/src/jalview/appletgui/FontChooser.java
b/src/jalview/appletgui/FontChooser.java
index
96dfc20
..
443ebce
100644
(file)
--- a/
src/jalview/appletgui/FontChooser.java
+++ b/
src/jalview/appletgui/FontChooser.java
@@
-125,8
+125,9
@@
public class FontChooser extends Panel implements ItemListener
{
this.ap = ap;
oldFont = ap.av.getFont();
{
this.ap = ap;
oldFont = ap.av.getFont();
- oldCharWidth = ap.av.getViewStyle().getCharWidth();
- oldScaleProtein = ap.av.getViewStyle().isScaleProteinAsCdna();
+ oldCharWidth = ap.av.getCharWidth();
+ oldScaleProtein = ap.av.isScaleProteinAsCdna();
+ oldMirrorFont = ap.av.isProteinFontAsCdna();
try
{
try
{
@@
-260,7
+261,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)
{
@@
-289,11
+290,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
@@
-480,8
+481,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();
}