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
Merge branch 'bug/JAL-2865removeGC' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewCanvas.java
diff --git
a/src/jalview/gui/OverviewCanvas.java
b/src/jalview/gui/OverviewCanvas.java
index
7371eb5
..
7994bf2
100644
(file)
--- a/
src/jalview/gui/OverviewCanvas.java
+++ b/
src/jalview/gui/OverviewCanvas.java
@@
-161,7
+161,6
@@
public class OverviewCanvas extends JComponent
od.getColumns(av.getAlignment()));
mg.translate(0, -od.getSequencesHeight());
}
od.getColumns(av.getAlignment()));
mg.translate(0, -od.getSequencesHeight());
}
- System.gc();
or.removePropertyChangeListener(progressPanel);
or = null;
or.removePropertyChangeListener(progressPanel);
or = null;
@@
-183,6
+182,8
@@
public class OverviewCanvas extends JComponent
@Override
public void paintComponent(Graphics g)
{
@Override
public void paintComponent(Graphics g)
{
+ super.paintComponent(g);
+
if (restart)
{
if (lastMiniMe == null)
if (restart)
{
if (lastMiniMe == null)
@@
-204,7
+205,8
@@
public class OverviewCanvas extends JComponent
&& ((getWidth() != od.getWidth())
|| (getHeight() != od.getHeight())))
{
&& ((getWidth() != od.getWidth())
|| (getHeight() != od.getHeight())))
{
- // if there is annotation, scale the alignment and annotation separately
+ // if there is annotation, scale the alignment and annotation
+ // separately
if (od.getGraphHeight() > 0)
{
BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
if (od.getGraphHeight() > 0)
{
BufferedImage topImage = lastMiniMe.getSubimage(0, 0,
@@
-235,25
+237,24
@@
public class OverviewCanvas extends JComponent
od.setHeight(getHeight());
}
od.setHeight(getHeight());
}
- // scale lastMiniMe to the new size
- g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
-
// make sure the box is in the right place
od.setBoxPosition(av.getAlignment().getHiddenSequences(),
av.getAlignment().getHiddenColumns());
}
// make sure the box is in the right place
od.setBoxPosition(av.getAlignment().getHiddenSequences(),
av.getAlignment().getHiddenColumns());
}
- else // not a resize
- {
- // fall back to normal behaviour
- g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
- }
+ // fall back to normal behaviour
+ g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
}
}
-
+ else
+ {
+ g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
+ }
+
// draw the box
g.setColor(Color.red);
od.drawBox(g);
}
// draw the box
g.setColor(Color.red);
od.drawBox(g);
}
+
public void dispose()
{
dispose = true;
public void dispose()
{
dispose = true;