X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=9add7478d65d0cddd5db0b3eb0b04a7b55bde202;hb=52fd681e0f239e20df19fd7560d4b999104ba222;hp=e9082b88cc761f024cc6a48279f55d8172fb28fd;hpb=f0ea7e292e26e7cec19720be39b143d261f53821;p=jalview.git diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java index e9082b8..9add747 100755 --- a/src/jalview/gui/ScalePanel.java +++ b/src/jalview/gui/ScalePanel.java @@ -167,6 +167,11 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList int res = (evt.getX() / av.getCharWidth()) + av.getStartRes(); + if(res> av.alignment.getWidth()) + { + res = av.alignment.getWidth()-1; + } + if(av.hasHiddenColumns) res = av.getColumnSelection().adjustForHiddenColumns(res); @@ -206,6 +211,12 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList if(av.hasHiddenColumns) res = av.getColumnSelection().adjustForHiddenColumns(res); + + if(res> av.alignment.getWidth()) + { + res = av.alignment.getWidth()-1; + } + if (res < min) { min = res; @@ -217,6 +228,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList } + + SequenceGroup sg = av.getSelectionGroup(); if (sg != null)