Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2cb8d22 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev

parents a5d5d608 f2e61154
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -6448,13 +6448,17 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
                                mWebViewPrivate.getVerticalScrollFactor());
                        final int hdelta = (int) (hscroll *
                                mWebViewPrivate.getHorizontalScrollFactor());
                        if (pinScrollBy(hdelta, vdelta, false, 0)) {

                        abortAnimation();
                        int oldTouchMode = mTouchMode;
                        startScrollingLayer(event.getX(), event.getY());
                        doDrag(hdelta, vdelta);
                        mTouchMode = oldTouchMode;
                        return true;
                    }
                }
            }
        }
        }
        return mWebViewPrivate.super_onGenericMotionEvent(event);
    }