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
Take into account scroll value
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
bc14d66
..
d97c80f
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-76,6
+76,12
@@
public class AnnotationPanel extends JPanel implements MouseListener,
ap.annotationScroller.getVerticalScrollBar().addAdjustmentListener(this);
\r
}
\r
\r
ap.annotationScroller.getVerticalScrollBar().addAdjustmentListener(this);
\r
}
\r
\r
+ public AnnotationPanel(AlignViewport av)
\r
+ {
\r
+ this.av = av;
\r
+ }
\r
+
\r
+
\r
/**
\r
* DOCUMENT ME!
\r
*
\r
/**
\r
* DOCUMENT ME!
\r
*
\r
@@
-89,7
+95,7
@@
public class AnnotationPanel extends JPanel implements MouseListener,
/**
\r
* DOCUMENT ME!
\r
*/
\r
/**
\r
* DOCUMENT ME!
\r
*/
\r
- public void adjustPanelHeight()
\r
+ public int adjustPanelHeight()
\r
{
\r
// setHeight of panels
\r
image = null;
\r
{
\r
// setHeight of panels
\r
image = null;
\r
@@
-136,6
+142,8
@@
public class AnnotationPanel extends JPanel implements MouseListener,
}
\r
\r
this.setPreferredSize(new Dimension(1, height));
\r
}
\r
\r
this.setPreferredSize(new Dimension(1, height));
\r
+
\r
+ return height;
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-606,13
+614,13
@@
public class AnnotationPanel extends JPanel implements MouseListener,
* @param startRes DOCUMENT ME!
\r
* @param endRes DOCUMENT ME!
\r
*/
\r
* @param startRes DOCUMENT ME!
\r
* @param endRes DOCUMENT ME!
\r
*/
\r
- public void drawComponent(Graphics2D g, int startRes, int endRes)
\r
+ public void drawComponent(Graphics g, int startRes, int endRes)
\r
{
\r
{
\r
+ g.setFont(av.getFont());
\r
+
\r
if (fm == null)
\r
fm = g.getFontMetrics();
\r
\r
if (fm == null)
\r
fm = g.getFontMetrics();
\r
\r
- if(fm==null)
\r
- fm = g.getFontMetrics();
\r
\r
g.setColor(Color.white);
\r
g.fillRect(0, 0, (endRes - startRes) * av.charWidth, getHeight());
\r
\r
g.setColor(Color.white);
\r
g.fillRect(0, 0, (endRes - startRes) * av.charWidth, getHeight());
\r