From: kiramt <k.mourao@dundee.ac.uk>
Date: Fri, 14 Jul 2017 09:01:25 +0000 (+0100)
Subject: Merge branch 'feature/JAL-2613' into feature/JAL-2611
X-Git-Tag: Release_2_10_3b1~132^2~30^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9db5c5efc51b819623790eaf1b7145dd2936d029;p=jalview.git

Merge branch 'feature/JAL-2613' into feature/JAL-2611

Conflicts:
	src/jalview/viewmodel/OverviewDimensions.java
---

9db5c5efc51b819623790eaf1b7145dd2936d029
diff --cc src/jalview/viewmodel/OverviewDimensions.java
index 36b5e0f,335f1fa..68318ee
--- a/src/jalview/viewmodel/OverviewDimensions.java
+++ b/src/jalview/viewmodel/OverviewDimensions.java
@@@ -241,23 -241,8 +241,29 @@@ public abstract class OverviewDimension
      boxHeight = Math.round((float) vpheight * sequencesHeight / alheight);
    }
  
 +  /**
 +   * Answers if a mouse position is in the overview's red box
 +   * 
 +   * @param x
 +   *          mouse x position
 +   * @param y
 +   *          mouse y position
 +   * @return true if (x,y) is inside the box
 +   */
 +  public boolean isPositionInBox(int x, int y)
 +  {
 +    return (x > boxX && y > boxY && boxX + x < boxWidth
 +            && boxY + y < boxHeight);
 +  }
 +
 +  public void setMousePosition(int x, int y)
 +  {
 +
 +  }
++
+   protected abstract int getLeftXFromCentreX(int mousex, HiddenColumns hidden);
+ 
+   protected abstract int getTopYFromCentreY(int mousey,
+           HiddenSequences hidden);
++
  }