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
Fire alignment changed if seqs hidden / revealed
[jalview.git]
/
src
/
jalview
/
gui
/
SeqPanel.java
diff --git
a/src/jalview/gui/SeqPanel.java
b/src/jalview/gui/SeqPanel.java
index
9ea087e
..
a4d9240
100755
(executable)
--- a/
src/jalview/gui/SeqPanel.java
+++ b/
src/jalview/gui/SeqPanel.java
@@
-147,7
+147,6
@@
public class SeqPanel extends JPanel implements MouseListener,
\r
int findSeq(MouseEvent evt)
\r
{
\r
\r
int findSeq(MouseEvent evt)
\r
{
\r
-
\r
int seq = 0;
\r
int y = evt.getY();
\r
\r
int seq = 0;
\r
int y = evt.getY();
\r
\r
@@
-162,11
+161,13
@@
public class SeqPanel extends JPanel implements MouseListener,
\r
y -= hgap;
\r
\r
\r
y -= hgap;
\r
\r
- seq = ( (y % cHeight) / av.getCharHeight());
\r
+ seq = Math.min( (y % cHeight) / av.getCharHeight(),
\r
+ av.alignment.getHeight() -1);
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- seq = (y / av.getCharHeight()) + av.getStartSeq();
\r
+ seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),
\r
+ av.alignment.getHeight() -1);
\r
}
\r
\r
return seq;
\r
}
\r
\r
return seq;
\r
@@
-1032,8
+1033,6
@@
public class SeqPanel extends JPanel implements MouseListener,
\r
if (blankColumn <= j)
\r
{
\r
\r
if (blankColumn <= j)
\r
{
\r
- System.out.println("END HERE "+seq.getName()+" "+seq.getLength()+" "+j+" "
\r
- +blankColumn+" "+fixedColumn);
\r
blankColumn = fixedColumn;
\r
endEditing();
\r
return;
\r
blankColumn = fixedColumn;
\r
endEditing();
\r
return;
\r
@@
-1244,14
+1243,6
@@
public class SeqPanel extends JPanel implements MouseListener,
\r
}
\r
\r
\r
}
\r
\r
- if (av.cursorMode)
\r
- {
\r
- seqCanvas.cursorX = findRes(evt);
\r
- seqCanvas.cursorY = findSeq(evt);
\r
- seqCanvas.repaint();
\r
- return;
\r
- }
\r
-
\r
\r
if (javax.swing.SwingUtilities.isRightMouseButton(evt))
\r
{
\r
\r
if (javax.swing.SwingUtilities.isRightMouseButton(evt))
\r
{
\r
@@
-1272,9
+1263,18
@@
public class SeqPanel extends JPanel implements MouseListener,
\r
jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);
\r
pop.show(this, evt.getX(), evt.getY());
\r
\r
jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(ap, null, links);
\r
pop.show(this, evt.getX(), evt.getY());
\r
+ return;
\r
+ }
\r
\r
\r
+ if (av.cursorMode)
\r
+ {
\r
+ seqCanvas.cursorX = findRes(evt);
\r
+ seqCanvas.cursorY = findSeq(evt);
\r
+ seqCanvas.repaint();
\r
+ return;
\r
}
\r
}
\r
- else if (stretchGroup == null)
\r
+
\r
+ if (stretchGroup == null)
\r
{
\r
//Only if left mouse button do we want to change group sizes
\r
\r
{
\r
//Only if left mouse button do we want to change group sizes
\r
\r
@@
-1373,11
+1373,6
@@
public class SeqPanel extends JPanel implements MouseListener,
return;
\r
}
\r
\r
return;
\r
}
\r
\r
-
\r
- if(y > av.alignment.getHeight())
\r
- {
\r
- y = av.alignment.getHeight() -1;
\r
- }
\r
if(res> av.alignment.getWidth())
\r
{
\r
res = av.alignment.getWidth()-1;
\r
if(res> av.alignment.getWidth())
\r
{
\r
res = av.alignment.getWidth()-1;
\r