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 (parent:
e5b9487
)
JAL-2842 JAL-2759 change to SeqPanel moveCursor
author
kiramt
<k.mourao@dundee.ac.uk>
Wed, 22 Nov 2017 16:08:59 +0000
(16:08 +0000)
committer
kiramt
<k.mourao@dundee.ac.uk>
Wed, 22 Nov 2017 16:08:59 +0000
(16:08 +0000)
src/jalview/gui/SeqPanel.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
e11af48
..
8b80ffd
100644
(file)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-363,10
+363,25
@@
public class SeqPanel extends JPanel
int original = seqCanvas.cursorX - dx;
int maxWidth = av.getAlignment().getWidth();
int original = seqCanvas.cursorX - dx;
int maxWidth = av.getAlignment().getWidth();
- while (!hidden.isVisible(seqCanvas.cursorX)
- && seqCanvas.cursorX < maxWidth && seqCanvas.cursorX > 0)
+ if (!hidden.isVisible(seqCanvas.cursorX))
{
{
- seqCanvas.cursorX += dx;
+ int visx = hidden.findColumnPosition(seqCanvas.cursorX - dx);
+ int[] region = hidden.getRegionWithEdgeAtRes(visx);
+
+ if (region != null) // just in case
+ {
+ if (dx == 1)
+ {
+ // moving right
+ seqCanvas.cursorX = region[1] + 1;
+ }
+ else if (dx == -1)
+ {
+ // moving left
+ seqCanvas.cursorX = region[0] - 1;
+ }
+ }
+ seqCanvas.cursorX = (seqCanvas.cursorX < 0) ? 0 : seqCanvas.cursorX;
}
if (seqCanvas.cursorX >= maxWidth
}
if (seqCanvas.cursorX >= maxWidth