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 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into...
[jalview.git]
/
src
/
jalview
/
gui
/
SeqPanel.java
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
04ceea6
..
2df55ad
100644
(file)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-321,8
+321,10
@@
public class SeqPanel extends JPanel
}
else
{
}
else
{
- seqIndex = Math.min((y / charHeight) + av.getRanges().getStartSeq(),
+ ViewportRanges ranges = av.getRanges();
+ seqIndex = Math.min((y / charHeight) + ranges.getStartSeq(),
alignmentHeight - 1);
alignmentHeight - 1);
+ seqIndex = Math.min(seqIndex, ranges.getEndSeq());
}
return new MousePos(col, seqIndex, annIndex);
}
return new MousePos(col, seqIndex, annIndex);
@@
-1940,6
+1942,7
@@
public class SeqPanel extends JPanel
@Override
public void mouseExited(MouseEvent e)
{
@Override
public void mouseExited(MouseEvent e)
{
+ lastMousePosition = null;
ap.alignFrame.setStatus(" ");
if (av.getWrapAlignment())
{
ap.alignFrame.setStatus(" ");
if (av.getWrapAlignment())
{
@@
-2405,14
+2408,7
@@
public class SeqPanel extends JPanel
{
scrollThread = new ScrollThread();
scrollThread.setMousePosition(mousePos);
{
scrollThread = new ScrollThread();
scrollThread.setMousePosition(mousePos);
- if (!Platform.isJS())
- {
- /*
- * Java - run in a new thread
- */
- scrollThread.start();
- }
- else
+ if (Platform.isJS())
{
/*
* Javascript - run every 20ms until scrolling stopped
{
/*
* Javascript - run every 20ms until scrolling stopped
@@
-2445,6
+2441,13
@@
public class SeqPanel extends JPanel
t.start();
}
}
t.start();
}
}
+ else
+ {
+ /*
+ * Java - run in a new thread
+ */
+ scrollThread.start();
+ }
}
/**
}
/**