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 'develop' into features/JAL-2110_crossRefDuplications
[jalview.git]
/
src
/
jalview
/
appletgui
/
ScalePanel.java
diff --git
a/src/jalview/appletgui/ScalePanel.java
b/src/jalview/appletgui/ScalePanel.java
index
3c6a4f1
..
71ecb13
100755
(executable)
--- a/
src/jalview/appletgui/ScalePanel.java
+++ b/
src/jalview/appletgui/ScalePanel.java
@@
-410,6
+410,8
@@
public class ScalePanel extends Panel implements MouseMotionListener,
int avcharWidth = av.getCharWidth(), avcharHeight = av.getCharHeight();
for (int sel : cs.getSelected())
{
int avcharWidth = av.getCharWidth(), avcharHeight = av.getCharHeight();
for (int sel : cs.getSelected())
{
+ // TODO: JAL-2001 - provide a fast method to list visible selected in a
+ // given range
if (av.hasHiddenColumns())
{
sel = av.getColumnSelection().findColumnPosition(sel);
if (av.hasHiddenColumns())
{
sel = av.getColumnSelection().findColumnPosition(sel);
@@
-426,6
+428,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
gg.setColor(Color.black);
int scalestartx = (startx / 10) * 10;
gg.setColor(Color.black);
int scalestartx = (startx / 10) * 10;
+ int widthx = 1 + endx - startx;
FontMetrics fm = gg.getFontMetrics(av.getFont());
int y = avcharHeight - fm.getDescent();
FontMetrics fm = gg.getFontMetrics(av.getFont());
int y = avcharHeight - fm.getDescent();
@@
-477,7
+480,7
@@
public class ScalePanel extends Panel implements MouseMotionListener,
res = av.getColumnSelection().findHiddenRegionPosition(i)
- startx;
res = av.getColumnSelection().findHiddenRegionPosition(i)
- startx;
- if (res < 0 || res > endx - scalestartx)
+ if (res < 0 || res > widthx)
{
continue;
}
{
continue;
}