From 1885854264e2a94ab3db48c3afb19cb5f78c794d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B8=D0=BB=D1=8F=D0=BD=20=D0=9F=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=D1=83=D0=B7=D0=BE=D0=B2?= Date: Sun, 16 Apr 2023 09:19:57 +0200 Subject: M!118 - iTIP-formatter: respect the color-scheme in HTML MIME parts Related to https://gitlab.gnome.org/GNOME/evolution/-/issues/2275 Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2284 Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/118 --- data/webkit/e-web-view.js | 15 --------------- src/em-format/e-mail-formatter-text-html.c | 2 +- src/modules/itip-formatter/itip-view.c | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js index 2752c7b839..e5d01629b4 100644 --- a/data/webkit/e-web-view.js +++ b/data/webkit/e-web-view.js @@ -695,21 +695,6 @@ Evo.initialize = function(elem) if (doc.defaultView && !doc.defaultView.frameElement && !doc.body.hasAttribute("class")) doc.body.className = "-e-web-view-background-color -e-web-view-text-color"; - - if (doc.documentElement.style.getPropertyValue("color") == "" || - doc.documentElement.style.getPropertyValue("color") == "text") { - if (doc.defaultView && doc.defaultView.frameElement && !doc.defaultView.frameElement.hasAttribute("x-e-unset-colors") && - doc.defaultView.frameElement.ownerDocument && - doc.defaultView.frameElement.ownerDocument.defaultView && - doc.defaultView.frameElement.ownerDocument.defaultView.window) { - var style = doc.defaultView.frameElement.ownerDocument.defaultView.window.getComputedStyle(doc.defaultView.frameElement); - if (style) { - doc.documentElement.style.setProperty("color", style.color); - doc.documentElement.style.setProperty("background-color", style.backgroundColor); - } - } - } - elems = doc.querySelectorAll("input, textarea, select, button, label"); for (ii = 0; ii < elems.length; ii++) { diff --git a/src/em-format/e-mail-formatter-text-html.c b/src/em-format/e-mail-formatter-text-html.c index 8a938212ff..777254eaca 100644 --- a/src/em-format/e-mail-formatter-text-html.c +++ b/src/em-format/e-mail-formatter-text-html.c @@ -369,7 +369,7 @@ emfe_text_html_format (EMailFormatterExtension *extension, e_mail_part_get_id (part), e_mail_part_get_id (part), e_mail_part_get_frame_security_style (part), - g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color:white; color:black;\""); + g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color: #fff; color-scheme: light\""); g_output_stream_write_all ( stream, str, strlen (str), diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c index d77ab891b9..ee13f493d3 100644 --- a/src/modules/itip-formatter/itip-view.c +++ b/src/modules/itip-formatter/itip-view.c @@ -2163,7 +2163,7 @@ itip_view_write (gpointer itip_part_ptr, uri, e_mail_part_get_id (part), e_mail_part_get_id (part), - g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color: #ffffff; color:#000000;\""); + g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color: #fff; color-scheme: light\""); g_clear_object (&settings); g_free (uri); -- cgit v1.2.1