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 (from parent 1:
2f96125
)
JAL-2609 tweaks including fully erasing scale above
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Mon, 21 Aug 2017 14:53:18 +0000
(15:53 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Mon, 21 Aug 2017 14:53:18 +0000
(15:53 +0100)
src/jalview/gui/SeqCanvas.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/SeqCanvas.java
b/src/jalview/gui/SeqCanvas.java
index
088a359
..
46f2d84
100755
(executable)
--- a/
src/jalview/gui/SeqCanvas.java
+++ b/
src/jalview/gui/SeqCanvas.java
@@
-709,17
+709,17
@@
public class SeqCanvas extends JComponent implements ViewportListenerI
drawVerticalScale(g, startColumn, endColumn, ypos, false);
}
drawVerticalScale(g, startColumn, endColumn, ypos, false);
}
- g.translate(labelWidthWest, 0);
-
/*
* white fill region of scale above and hidden column markers
* (to support incremental fast paint of image)
*/
g.setColor(Color.white);
g.fillRect(0, ypos - wrappedSpaceAboveAlignment, viewportWidth
/*
* white fill region of scale above and hidden column markers
* (to support incremental fast paint of image)
*/
g.setColor(Color.white);
g.fillRect(0, ypos - wrappedSpaceAboveAlignment, viewportWidth
- * charWidth, wrappedSpaceAboveAlignment);
+ * charWidth + labelWidthWest, wrappedSpaceAboveAlignment);
g.setColor(Color.black);
g.setColor(Color.black);
+ g.translate(labelWidthWest, 0);
+
if (av.getScaleAboveWrapped())
{
drawNorthScale(g, startColumn, endColumn, ypos);
if (av.getScaleAboveWrapped())
{
drawNorthScale(g, startColumn, endColumn, ypos);
@@
-1456,7
+1456,7
@@
public class SeqCanvas extends JComponent implements ViewportListenerI
if (lastWidthPartHeight)
{
if (lastWidthPartHeight)
{
- int widthsAbove = visibleWidths - 2;
+ int widthsAbove = Math.max(0, visibleWidths - 2);
int ypos = wrappedRepeatHeightPx * widthsAbove
+ wrappedSpaceAboveAlignment;
int endRes = ranges.getEndRes();
int ypos = wrappedRepeatHeightPx * widthsAbove
+ wrappedSpaceAboveAlignment;
int endRes = ranges.getEndRes();