[evolution] Bug 725254 - Smaller font size shown as 0 in preview when received

[Milan Crha <mcrha src gnome org>]

commit b9589fdf1d7ec3c1391616ecbc5fa6b6b1fd998f
Author: Milan Crha <mcrha redhat com>
Date:   Tue Apr 28 12:43:15 2020 +0200

    Bug 725254 - Smaller font size shown as 0 in preview when received
    
    Simply do not limit minimum font size for the WebKitWebView.
    
    Closes https://bugzilla.gnome.org/show_bug.cgi?id=725254

 src/e-util/e-web-view.c                     | 10 +---------
 src/modules/webkit-editor/e-webkit-editor.c | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/src/e-util/e-web-view.c b/src/e-util/e-web-view.c
index 23b125aaee..f12602b558 100644
--- a/src/e-util/e-web-view.c
+++ b/src/e-util/e-web-view.c
@@ -3264,7 +3264,7 @@ e_web_view_update_fonts_settings (GSettings *font_settings,
        GdkColor *visited = NULL;
        GString *stylesheet;
        GtkStyleContext *context;
-       PangoFontDescription *min_size, *ms, *vw;
+       PangoFontDescription *ms, *vw;
        WebKitSettings *wk_settings;
        WebKitUserContentManager *manager;
        WebKitUserStyleSheet *style_sheet;
@@ -3301,11 +3301,6 @@ e_web_view_update_fonts_settings (GSettings *font_settings,
        } else
                vw = vw_font;
 
-       if (pango_font_description_get_size (ms) < pango_font_description_get_size (vw))
-               min_size = ms;
-       else
-               min_size = vw;
-
        stylesheet = g_string_new ("");
        g_ascii_dtostr (fsbuff, G_ASCII_DTOSTR_BUF_SIZE,
                ((gdouble) pango_font_description_get_size (vw)) / PANGO_SCALE);
@@ -3528,9 +3523,6 @@ e_web_view_update_fonts_settings (GSettings *font_settings,
                "default-monospace-font-size",
                e_util_normalize_font_size (
                        view_widget, pango_font_description_get_size (ms) / PANGO_SCALE),
-               "minimum-font-size",
-               e_util_normalize_font_size (
-                       view_widget, pango_font_description_get_size (min_size) / PANGO_SCALE),
                NULL);
 
        manager = webkit_web_view_get_user_content_manager (WEBKIT_WEB_VIEW (view_widget));
diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
index 885b0f42c1..efa8596706 100644
--- a/src/modules/webkit-editor/e-webkit-editor.c
+++ b/src/modules/webkit-editor/e-webkit-editor.c
@@ -1162,7 +1162,7 @@ webkit_editor_update_styles (EContentEditor *editor)
        const gchar *smoothing = NULL;
        gchar fsbuff[G_ASCII_DTOSTR_BUF_SIZE];
        GString *stylesheet;
-       PangoFontDescription *min_size, *ms, *vw;
+       PangoFontDescription *ms, *vw;
        WebKitSettings *settings;
        WebKitUserContentManager *manager;
        WebKitUserStyleSheet *style_sheet;
@@ -1600,11 +1600,6 @@ webkit_editor_update_styles (EContentEditor *editor)
                        "}\n");
        }
 
-       if (pango_font_description_get_size (ms) < pango_font_description_get_size (vw) || 
!wk_editor->priv->html_mode)
-               min_size = ms;
-       else
-               min_size = vw;
-
        settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (wk_editor));
        g_object_set (
                G_OBJECT (settings),
@@ -1618,9 +1613,6 @@ webkit_editor_update_styles (EContentEditor *editor)
                "default-monospace-font-size",
                e_util_normalize_font_size (
                        GTK_WIDGET (wk_editor), pango_font_description_get_size (ms) / PANGO_SCALE),
-               "minimum-font-size",
-               e_util_normalize_font_size (
-                       GTK_WIDGET (wk_editor), pango_font_description_get_size (min_size) / PANGO_SCALE),
                NULL);
 
        manager = webkit_web_view_get_user_content_manager (WEBKIT_WEB_VIEW (wk_editor));