diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-05-08 16:23:38 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-05-08 16:23:38 +0300 |
| commit | 30e5f028f7ade469d87b12f0f68d228be511ed2e (patch) | |
| tree | 82eb37539795f55ef1ba3609b79c39226db2ecfe /org.fox.ttrss/src | |
| parent | 862d99586c3c9de5d41bddb45e7330eab3cd40d3 (diff) | |
try setting margins inside webview content so scrollbar is properly positioned
Diffstat (limited to 'org.fox.ttrss/src')
3 files changed, 10 insertions, 3 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index aa623b6c..7344480f 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -497,7 +497,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); ws.setMediaPlaybackRequiresUserGesture(true); - if (m_prefs.getBoolean("justify_article_text", true)) { cssOverride += "body { text-align : justify; } "; } @@ -506,12 +505,14 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { ws.setDefaultFontSize(m_articleFontSize); + int margin8dp = CommonActivity.dpToPx(getContext(), 8); + StringBuilder content = new StringBuilder("<html>" + "<head>" + "<meta content=\"text/html; charset=utf-8\" http-equiv=\"content-type\">" + "<meta name=\"viewport\" content=\"width=device-width, user-scalable=no\" />" + "<style type=\"text/css\">" + - "body { padding : 0px; margin : 0px; line-height : 1.3; word-wrap: break-word; }" + + "body { padding : 0px; margin : "+margin8dp+"px; line-height : 1.3; word-wrap: break-word; }" + "h1, h2, h3, h4, h5, h6 { line-height: 1; text-align: initial; }" + "img, video, iframe { max-width : 100%; width : auto; height : auto; }" + " table { width : 100%; }" + diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 4eb5b6f0..fad4f8ef 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -27,6 +27,7 @@ import android.os.Bundle; import android.os.SystemClock; import android.preference.PreferenceManager; import android.text.TextUtils; +import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; import android.view.Display; @@ -652,5 +653,11 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc JobIntentService.enqueueWork(context.getApplicationContext(), WidgetUpdateService.class, 0, new Intent()); } + static public int dpToPx(Context context, int dp) { + DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics(); + int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); + return px; + } + } diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 197a8077..e78ab258 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -190,7 +190,6 @@ <com.telefonica.nestedscrollwebview.NestedScrollWebView android:id="@+id/article_content" - android:layout_marginTop="8dp" app:layout_behavior="@string/appbar_scrolling_view_behavior" android:layout_width="match_parent" android:layout_height="wrap_content" /> |