android: add contains (hit test) to CanvasElement interface

Change-Id: Ic0022790c9ee1a5be1352eba0815e0d63ae17025

3 files changed, 9 insertions, 0 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
index 154d4cec50ca..094894b205cb 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/CanvasElement.java
@@ -21,5 +21,12 @@ public interface CanvasElement {
      * @param canvas - the canvas
      */
     void draw(Canvas canvas);
+
+    /**
+     * Hit test - returns true if the object has been hit
+     * @param x - x coordinate of the
+     * @param y - y coordinate of the
+     */
+    boolean contains(float x, float y);
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
index 8251495911b0..4439badf2261 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelection.java
@@ -64,6 +64,7 @@ public class GraphicSelection implements CanvasElement {
         mHandles[7].reposition(scaledRectangle.right, scaledRectangle.bottom);
     }
 
+    @Override
     public boolean contains(float x, float y) {
         // Check if handle was hit
         for (GraphicSelectionHandle handle : mHandles) {
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
index 109592e2163c..a33589fa0698 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandle.java
@@ -73,6 +73,7 @@ public class GraphicSelectionHandle implements CanvasElement {
         mHitRect.bottom = mPosition.y + mRadius * 1.75f;
     }
 
+    @Override
     public boolean contains(float x, float y) {
         return mHitRect.contains(x, y);
     }