mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed original view scrolling issues

This commit is contained in:
M66B 2023-04-06 21:41:32 +02:00
parent dbd88712b7
commit 65caca4bab
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/WebViewEx.java
View File

@ -316,18 +316,20 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
intercept = (yoff > 0 || dy >= 0) && (yoff < bottom || dy <= 0); intercept = (yoff > 0 || dy >= 0) && (yoff < bottom || dy <= 0);
} }
int xrange = computeHorizontalScrollRange(); if (!intercept) {
int xextend = computeHorizontalScrollExtent(); int xrange = computeHorizontalScrollRange();
boolean canScrollHorizontal = (xrange > xextend); int xextend = computeHorizontalScrollExtent();
if (canScrollHorizontal) { boolean canScrollHorizontal = (xrange > xextend);
int right = xrange - xextend; if (canScrollHorizontal) {
int xoff = computeHorizontalScrollOffset(); int right = xrange - xextend;
int ldx = xoff - lastXoff; int xoff = computeHorizontalScrollOffset();
float dx = lastX - event.getX(); int ldx = xoff - lastXoff;
intercept = (xoff > 0 || dx >= 0) && float dx = lastX - event.getX();
(xoff < right || dx <= 0) && intercept = (xoff > 0 || dx >= 0) &&
(Math.signum(dx) == Math.signum(ldx)); (xoff < right || dx <= 0) &&
lastXoff = xoff; (Math.signum(dx) == Math.signum(ldx));
lastXoff = xoff;
}
} }
} }
getParent().requestDisallowInterceptTouchEvent(intercept || event.getPointerCount() > 1); getParent().requestDisallowInterceptTouchEvent(intercept || event.getPointerCount() > 1);