From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 28 Jul 2006 16:04:16 +0000 (+0000)
Subject: Scrolling fixed and selection in wrapped mode updated
X-Git-Tag: Release_2_1~163
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=425c3769b24f953eed5af873d0e832e76c4d9c3a;p=jalview.git

Scrolling fixed and selection in wrapped mode updated
---

diff --git a/src/jalview/appletgui/IdPanel.java b/src/jalview/appletgui/IdPanel.java
index ed86488..eab849b 100755
--- a/src/jalview/appletgui/IdPanel.java
+++ b/src/jalview/appletgui/IdPanel.java
@@ -72,17 +72,7 @@ public class IdPanel
   Tooltip tooltip;
   public void mouseMoved(MouseEvent e)
   {
-    int y = e.getY();
-    if (av.getWrapAlignment())
-    {
-      y -= 2 * av.charHeight;
-    }
-
-    int seq = av.getIndex(y);
-    if (seq == -1)
-    {
-      return;
-    }
+    int seq = alignPanel.seqPanel.findSeq(e);
 
     SequenceI sequence = av.getAlignment().getSequenceAt(seq);
 
@@ -110,17 +100,7 @@ public class IdPanel
   {
     mouseDragging = true;
 
-    int y = e.getY();
-    if (av.getWrapAlignment())
-    {
-      y -= 2 * av.charHeight;
-    }
-    int seq = av.getIndex(y);
-
-    if (seq < 0)
-    {
-      return;
-    }
+    int seq = Math.max(0, alignPanel.seqPanel.findSeq(e));
 
     if (seq < lastid)
     {
@@ -140,15 +120,9 @@ public class IdPanel
     if (e.getClickCount() < 2)
         return;
 
-    int y = e.getY();
-
-    if (av.getWrapAlignment())
-    {
-      y -= (2 * av.charHeight);
-    }
 
     //DEFAULT LINK IS FIRST IN THE LINK LIST
-    int seq = av.getIndex(y);
+    int seq = alignPanel.seqPanel.findSeq(e);
     String id = av.getAlignment().getSequenceAt(seq).getName();
     if (id.indexOf("|") > -1)
         id = id.substring(id.lastIndexOf("|") + 1);
@@ -212,11 +186,7 @@ public class IdPanel
       y -= 2 * av.charHeight;
     }
 
-    int seq = av.getIndex(y);
-    if (seq == -1)
-    {
-      return;
-    }
+    int seq = alignPanel.seqPanel.findSeq(e);
 
     if ( (e.getModifiers() & InputEvent.BUTTON3_MASK) ==
         InputEvent.BUTTON3_MASK)
@@ -342,11 +312,12 @@ public class IdPanel
           {
             selectSeqs(lastid - 1, seq);
           }
-          else if (seq > lastid)
+          else if (seq > lastid && seq<av.alignment.getHeight())
           {
             selectSeqs(lastid + 1, seq);
           }
 
+
           lastid = seq;
         }
         else
diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 748a789..76ad67b 100755
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -445,11 +445,17 @@ public class SeqPanel
 
        y -= hgap;
 
-     seq = ( (y % cHeight) / av.getCharHeight());
+     seq = Math.min( (y % cHeight) / av.getCharHeight(),
+                     av.alignment.getHeight() -1);
+     if(seq<0)
+       seq = 0;
    }
    else
    {
-     seq = (y / av.getCharHeight()) + av.getStartSeq();
+     seq = Math.min( (y / av.getCharHeight()) + av.getStartSeq(),
+                     av.alignment.getHeight() -1);
+     if(seq<0)
+       seq = 0;
    }
 
    return seq;
@@ -1370,12 +1376,12 @@ public class SeqPanel
 
           if (mouseDragging && evt.getX() < 0)
           {
-            running = ap.scrollRight(true);
+            running = ap.scrollRight(false);
           }
 
           else if (mouseDragging && evt.getX() >= getSize().width)
           {
-            running = ap.scrollRight(false);
+            running = ap.scrollRight(true);
           }
         }