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:
02b51eb
)
Fit to Window bug fixed
author
amwaterhouse
<Andrew Waterhouse>
Wed, 17 Jan 2007 15:32:10 +0000
(15:32 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Wed, 17 Jan 2007 15:32:10 +0000
(15:32 +0000)
src/jalview/appletgui/TreeCanvas.java
patch
|
blob
|
history
diff --git
a/src/jalview/appletgui/TreeCanvas.java
b/src/jalview/appletgui/TreeCanvas.java
index
8b68489
..
0d80535
100755
(executable)
--- a/
src/jalview/appletgui/TreeCanvas.java
+++ b/
src/jalview/appletgui/TreeCanvas.java
@@
-353,10
+353,8
@@
public class TreeCanvas
paint(g);
\r
}
\r
\r
paint(g);
\r
}
\r
\r
- Image offscreen;
\r
- public void paint(Graphics g1)
\r
+ public void paint(Graphics g)
\r
{
\r
{
\r
-
\r
if(tree==null)
\r
return;
\r
\r
if(tree==null)
\r
return;
\r
\r
@@
-365,37
+363,27
@@
public class TreeCanvas
repaint();
\r
}
\r
\r
repaint();
\r
}
\r
\r
- FontMetrics fm = g1.getFontMetrics(font);
\r
-
\r
int width = scrollPane.getSize().width;
\r
int height = scrollPane.getSize().height;
\r
if(!fitToWindow)
\r
int width = scrollPane.getSize().width;
\r
int height = scrollPane.getSize().height;
\r
if(!fitToWindow)
\r
- height = fm.getHeight() * nameHash.size();
\r
+ {
\r
+ height = g.getFontMetrics(font).getHeight() * nameHash.size();
\r
+ }
\r
\r
\r
+ if(getSize().width>width)
\r
+ {
\r
+ setSize(new Dimension(width,height));
\r
+ scrollPane.validate();
\r
+ return;
\r
+ }
\r
\r
\r
- if(offscreen==null || offscreen.getWidth(this)!=width
\r
- || offscreen.getHeight(this)!=height)
\r
- offscreen = createImage(width, height);
\r
+ setSize(new Dimension(width,height));
\r
\r
\r
- Graphics g = offscreen.getGraphics();
\r
\r
g.setFont(font);
\r
\r
\r
g.setFont(font);
\r
\r
- if (fitToWindow ||
\r
- (!fitToWindow &&
\r
- scrollPane.getSize().height > fm.getHeight() * nameHash.size() + offy))
\r
- {
\r
- draw(g, scrollPane.getSize().width, scrollPane.getSize().height);
\r
- }
\r
- else
\r
- {
\r
- setSize(new Dimension(scrollPane.getSize().width,
\r
- fm.getHeight() * nameHash.size()));
\r
- draw(g, scrollPane.getSize().width, fm.getHeight() * nameHash.size());
\r
- }
\r
+ draw(g, width, height);
\r
\r
\r
- g1.drawImage(offscreen, 0, 0, this);
\r
- scrollPane.validate();
\r
}
\r
\r
\r
}
\r
\r
\r