From 3863ac87579d5167db90fcea668b3df81b9aefc2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 4 Jan 2022 18:50:26 +0100
Subject: [PATCH] Improved is zoomed

---
 .../java/eu/faircode/email/WebViewEx.java     | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index 172f112cf3..6fd4da7e83 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -26,6 +26,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
+import android.util.DisplayMetrics;
 import android.util.Pair;
 import android.view.InputDevice;
 import android.view.MotionEvent;
@@ -329,26 +330,11 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         return super.onGenericMotionEvent(event);
     }
 
-    public boolean isZoomedX() {
-        int xtend = computeHorizontalScrollExtent();
-        if (xtend != 0) {
-            float xscale = computeHorizontalScrollRange() / (float) xtend;
-            if (xscale > 1.2)
-                return true;
-        }
-
-        return false;
-    }
-
     public boolean isZoomedY() {
-        int ytend = computeVerticalScrollExtent();
-        if (ytend != 0) {
-            float yscale = computeVerticalScrollRange() / (float) ytend;
-            if (yscale > 1.2)
-                return true;
-        }
-
-        return false;
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        int ch = Math.round(getContentHeight() * dm.density);
+        int dp6 = Math.round(6 * dm.density);
+        return (ch - dp6 > getHeight());
     }
 
     public static boolean isFeatureSupported(String feature) {