|
 |
27c4a4 |
From ac15857f14eecd83a3a1950588a2f1edb9cb70de Mon Sep 17 00:00:00 2001
|
|
|
27c4a4 |
From: Milan Crha <mcrha@redhat.com>
|
|
|
27c4a4 |
Date: Fri, 18 Mar 2022 09:45:20 +0100
|
|
|
27c4a4 |
Subject: [PATCH] I#1835 - Mail: Preview uses wrong colors for HTML mail with
|
|
|
27c4a4 |
dark theme
|
|
|
27c4a4 |
|
|
|
27c4a4 |
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1835
|
|
|
27c4a4 |
---
|
|
|
27c4a4 |
data/webkit/e-web-view.js | 12 ++++++++++--
|
|
|
27c4a4 |
src/em-format/e-mail-formatter-text-html.c | 2 +-
|
|
|
27c4a4 |
2 files changed, 11 insertions(+), 3 deletions(-)
|
|
|
27c4a4 |
|
|
|
27c4a4 |
diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
|
|
|
27c4a4 |
index 7f47fe4b26..a8f99c4668 100644
|
|
|
27c4a4 |
--- a/data/webkit/e-web-view.js
|
|
|
27c4a4 |
+++ b/data/webkit/e-web-view.js
|
|
|
27c4a4 |
@@ -695,8 +695,16 @@ Evo.initialize = function(elem)
|
|
|
27c4a4 |
|
|
|
27c4a4 |
if (doc.documentElement.style.getPropertyValue("color") == "" ||
|
|
|
27c4a4 |
doc.documentElement.style.getPropertyValue("color") == "text") {
|
|
|
27c4a4 |
- doc.documentElement.style.setProperty("color", "inherit");
|
|
|
27c4a4 |
- doc.documentElement.style.setProperty("background-color", "inherit");
|
|
|
27c4a4 |
+ if (doc.defaultView && doc.defaultView.frameElement && !doc.defaultView.frameElement.hasAttribute("x-e-unset-colors") &&
|
|
|
27c4a4 |
+ doc.defaultView.frameElement.ownerDocument &&
|
|
|
27c4a4 |
+ doc.defaultView.frameElement.ownerDocument.defaultView &&
|
|
|
27c4a4 |
+ doc.defaultView.frameElement.ownerDocument.defaultView.window) {
|
|
|
27c4a4 |
+ var style = doc.defaultView.frameElement.ownerDocument.defaultView.window.getComputedStyle(doc.defaultView.frameElement);
|
|
|
27c4a4 |
+ if (style) {
|
|
|
27c4a4 |
+ doc.documentElement.style.setProperty("color", style.color);
|
|
|
27c4a4 |
+ doc.documentElement.style.setProperty("background-color", style.backgroundColor);
|
|
|
27c4a4 |
+ }
|
|
|
27c4a4 |
+ }
|
|
|
27c4a4 |
}
|
|
|
27c4a4 |
|
|
|
27c4a4 |
elems = doc.querySelectorAll("input, textarea, select, button, label");
|
|
|
27c4a4 |
diff --git a/src/em-format/e-mail-formatter-text-html.c b/src/em-format/e-mail-formatter-text-html.c
|
|
|
27c4a4 |
index 708c29a5e4..8a938212ff 100644
|
|
|
27c4a4 |
--- a/src/em-format/e-mail-formatter-text-html.c
|
|
|
27c4a4 |
+++ b/src/em-format/e-mail-formatter-text-html.c
|
|
|
27c4a4 |
@@ -369,7 +369,7 @@ emfe_text_html_format (EMailFormatterExtension *extension,
|
|
|
27c4a4 |
e_mail_part_get_id (part),
|
|
|
27c4a4 |
e_mail_part_get_id (part),
|
|
|
27c4a4 |
e_mail_part_get_frame_security_style (part),
|
|
|
27c4a4 |
- g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color: #ffffff;\"");
|
|
|
27c4a4 |
+ g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color:white; color:black;\"");
|
|
|
27c4a4 |
|
|
|
27c4a4 |
g_output_stream_write_all (
|
|
|
27c4a4 |
stream, str, strlen (str),
|
|
|
27c4a4 |
--
|
|
|
27c4a4 |
GitLab
|
|
|
27c4a4 |
|