git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
67f546e
)
JAL-1640 make font-size changes modify grid size again
author
Jim Procter
<jprocter@dundee.ac.uk>
Tue, 10 Feb 2015 17:08:51 +0000
(17:08 +0000)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Tue, 10 Feb 2015 17:08:51 +0000
(17:08 +0000)
src/jalview/gui/AlignViewport.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignViewport.java
b/src/jalview/gui/AlignViewport.java
index
a89174a
..
c4ac828
100644
(file)
--- a/
src/jalview/gui/AlignViewport.java
+++ b/
src/jalview/gui/AlignViewport.java
@@
-466,10
+466,8
@@
public class AlignViewport extends AlignmentViewport implements
boolean validCharWidth;
/**
boolean validCharWidth;
/**
- * DOCUMENT ME!
- *
- * @param f
- * DOCUMENT ME!
+ * update view settings with the given font. You may need to call
+ * alignPanel.fontChanged to update the layout geometry
*/
public void setFont(Font f)
{
*/
public void setFont(Font f)
{
@@
-480,15
+478,8
@@
public class AlignViewport extends AlignmentViewport implements
java.awt.FontMetrics fm = c.getFontMetrics(font);
int w = viewStyle.getCharWidth(), ww = fm.charWidth('M'), h = viewStyle
.getCharHeight();
java.awt.FontMetrics fm = c.getFontMetrics(font);
int w = viewStyle.getCharWidth(), ww = fm.charWidth('M'), h = viewStyle
.getCharHeight();
- // only update width/height if the new font won't fit
- if (h < fm.getHeight())
- {
- setCharHeight(fm.getHeight());
- }
- if (w < ww)
- {
- setCharWidth(ww);
- }
+ setCharHeight(fm.getHeight());
+ setCharWidth(ww);
viewStyle.setFontName(font.getName());
viewStyle.setFontStyle(font.getStyle());
viewStyle.setFontSize(font.getSize());
viewStyle.setFontName(font.getName());
viewStyle.setFontStyle(font.getStyle());
viewStyle.setFontSize(font.getSize());