Bug 1394526 - Ensure mouse events have the toolbar offset removed on Android r=esawin draft
authorRandall Barker <rbarker@mozilla.com>
Mon, 28 Aug 2017 16:10:15 -0700
changeset 654553 953b2c4146bac61a89178079f3a7386dd6181345
parent 654552 b534df0d1ef07c5fd580af4815c813839505f6ac
child 728585 a9f3c57db4ef863204306b9cf1d58b03ae171bc9
push id76596
push userbmo:rbarker@mozilla.com
push dateMon, 28 Aug 2017 23:14:28 +0000
reviewersesawin
bugs1394526
milestone57.0a1
Bug 1394526 - Ensure mouse events have the toolbar offset removed on Android r=esawin MozReview-Commit-ID: DK8p9lOBVaS
mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/NativePanZoomController.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/NativePanZoomController.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/NativePanZoomController.java
@@ -126,17 +126,18 @@ class NativePanZoomController extends JN
 
         if (count <= 0) {
             return false;
         }
 
         final MotionEvent.PointerCoords coords = new MotionEvent.PointerCoords();
         event.getPointerCoords(0, coords);
         final float x = coords.x;
-        final float y = coords.y;
+        // Mouse events are not adjusted by the AndroidDyanmicToolbarAnimator so adjust the offset here.
+        final float y = coords.y - mView.getCurrentToolbarHeight();
 
         return handleMouseEvent(event.getActionMasked(), event.getEventTime(), event.getMetaState(), x, y, event.getButtonState());
     }
 
 
     NativePanZoomController(View view) {
         mView = (LayerView) view;