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:
2a76359
)
JAL-3075 update column selection on mouse up after scroll
bug/JAL-3075
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 8 Mar 2019 11:26:52 +0000
(11:26 +0000)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 8 Mar 2019 11:26:52 +0000
(11:26 +0000)
src/jalview/gui/ScalePanel.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/ScalePanel.java
b/src/jalview/gui/ScalePanel.java
index
0f2b765
..
b95c569
100755
(executable)
--- a/
src/jalview/gui/ScalePanel.java
+++ b/
src/jalview/gui/ScalePanel.java
@@
-274,6
+274,7
@@
public class ScalePanel extends JPanel
@Override
public void mouseReleased(MouseEvent evt)
{
@Override
public void mouseReleased(MouseEvent evt)
{
+ boolean wasDragging = mouseDragging;
mouseDragging = false;
ap.getSeqPanel().stopScrolling();
mouseDragging = false;
ap.getSeqPanel().stopScrolling();
@@
-285,7
+286,8
@@
public class ScalePanel extends JPanel
res = av.getAlignment().getHiddenColumns()
.visibleToAbsoluteColumn(res);
}
res = av.getAlignment().getHiddenColumns()
.visibleToAbsoluteColumn(res);
}
- res = Math.min(res, av.getAlignment().getWidth() - 1);
+ res = Math.min(res, av.getRanges().getEndRes());
+ res = Math.max(0, res);
if (!stretchingGroup)
{
if (!stretchingGroup)
{
@@
-312,6
+314,12
@@
public class ScalePanel extends JPanel
{
sg.setStartRes(res);
}
{
sg.setStartRes(res);
}
+ if (wasDragging)
+ {
+ min = Math.min(res, min);
+ max = Math.max(res, max);
+ av.getColumnSelection().stretchGroup(res, sg, min, max);
+ }
}
stretchingGroup = false;
ap.paintAlignment(false, false);
}
stretchingGroup = false;
ap.paintAlignment(false, false);