[evolution] Bug 739955 - Wrap on mail Preview's width, not its content width
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 739955 - Wrap on mail Preview's width, not its content width
- Date: Thu, 10 Nov 2016 10:01:33 +0000 (UTC)
commit 8f32c3563bbbf53a90a3ba132e115c93d1c436a3
Author: Tomas Popela <tpopela redhat com>
Date: Thu Nov 10 10:47:37 2016 +0100
Bug 739955 - Wrap on mail Preview's width, not its content width
Force the width of the elements based on the preview width, but not for
messages that were formatted with text-highlight module (there is one
exception and it is the plain text formatting).
Also include additional fixes to our CSS:
* don't break the text in the middle of contact
* add missing border around some iframes
* remove some of the margins and paddings
data/webview.css | 34 +++-
src/em-format/e-mail-formatter-attachment.c | 2 +-
src/em-format/e-mail-formatter-message-rfc822.c | 3 +-
src/web-extensions/e-dom-utils.c | 235 ++++++++++++++++++++++-
src/web-extensions/e-dom-utils.h | 7 +
src/web-extensions/e-web-extension.c | 8 +-
6 files changed, 268 insertions(+), 21 deletions(-)
---
diff --git a/data/webview.css b/data/webview.css
index 5c0877c..28e98f3 100644
--- a/data/webview.css
+++ b/data/webview.css
@@ -9,7 +9,7 @@ img {
body {
/* Use margin so that children can safely use width=100% */
- margin: 10px;
+ margin: 5px 10px 5px 10px;
}
th {
@@ -44,21 +44,26 @@ img.navigable {
.attachment {
margin-left: 8px;
- margin-right: 8px;
+ margin-right: 0px;
}
-.attachment-wrapper
-{
- margin-right: 8px;
+.attachment td {
+ padding: 0px;
+}
+
+iframe:not([id$=".itip"]) {
+ border-width: 1px;
+ border-style: solid;
}
.part-container {
height: 100%;
margin-top: 2px;
- margin-bottom: 3px;
- border-width: 1px;
- border-style: solid;
- right: 0;
+ margin-bottom: 2px;
+}
+
+.part-container-nostyle iframe {
+ margin-right: 10px;
}
.part-container-inner-margin {
@@ -76,8 +81,8 @@ object { /* GtkWidgets */
}
a {
- white-space:normal;
- word-break:break-all;
+ white-space: normal;
+ word-break: break-all;
}
/**** HEADERS ****/
@@ -102,6 +107,13 @@ th.header {
td.header {
width: inherit;
+ white-space: normal;
+ word-break: normal;
+}
+
+/* We don't want to break in the middle of contact. */
+td.header a {
+ white-space: nowrap;
}
.ltr {
diff --git a/src/em-format/e-mail-formatter-attachment.c b/src/em-format/e-mail-formatter-attachment.c
index 7430fb2..348656d 100644
--- a/src/em-format/e-mail-formatter-attachment.c
+++ b/src/em-format/e-mail-formatter-attachment.c
@@ -257,7 +257,7 @@ emfe_attachment_format (EMailFormatterExtension *extension,
g_string_append_printf (
buffer,
"<div class=\"attachment\">"
- "<table width=\"100%%\" border=\"0\">"
+ "<table width=\"100%%\" border=\"0\" style=\"border-spacing: 0px\">"
"<tr valign=\"middle\">"
"<td align=\"left\" width=\"1px\" style=\"white-space:pre;\">"
"<button type=\"button\" class=\"attachment-expander\" id=\"%s\" value=\"%p\" data=\"%s\"
style=\"vertical-align:middle; margin:0px;\" %s>"
diff --git a/src/em-format/e-mail-formatter-message-rfc822.c b/src/em-format/e-mail-formatter-message-rfc822.c
index 2e77d9f..5df3a2e 100644
--- a/src/em-format/e-mail-formatter-message-rfc822.c
+++ b/src/em-format/e-mail-formatter-message-rfc822.c
@@ -221,10 +221,11 @@ emfe_message_rfc822_format (EMailFormatterExtension *extension,
NULL);
str = g_strdup_printf (
- "<div class=\"part-container -e-mail-formatter-frame-color "
+ "<div class=\"part-container "
"-e-mail-formatter-body-color\">\n"
"<iframe width=\"100%%\" height=\"10\""
" id=\"%s.iframe\" "
+ " class=\"-e-mail-formatter-frame-color\""
" frameborder=\"0\" src=\"%s\" name=\"%s\"></iframe>"
"</div>",
part_id, uri, part_id);
diff --git a/src/web-extensions/e-dom-utils.c b/src/web-extensions/e-dom-utils.c
index 0330346..41c6806 100644
--- a/src/web-extensions/e-dom-utils.c
+++ b/src/web-extensions/e-dom-utils.c
@@ -480,11 +480,11 @@ e_dom_utils_create_and_add_css_style_sheet (WebKitDOMDocument *document,
}
}
-static void
-add_css_rule_into_style_sheet (WebKitDOMDocument *document,
- const gchar *style_sheet_id,
- const gchar *selector,
- const gchar *style)
+void
+e_dom_utils_add_css_rule_into_style_sheet_in_document (WebKitDOMDocument *document,
+ const gchar *style_sheet_id,
+ const gchar *selector,
+ const gchar *style)
{
WebKitDOMElement *style_element;
WebKitDOMStyleSheet *sheet = NULL;
@@ -492,7 +492,9 @@ add_css_rule_into_style_sheet (WebKitDOMDocument *document,
gint length, ii, selector_length;
gboolean removed = FALSE;
- g_return_if_fail (selector != NULL);
+ g_return_if_fail (WEBKIT_DOM_IS_HTML_DOCUMENT (document));
+ g_return_if_fail (style_sheet_id && *style_sheet_id);
+ g_return_if_fail (selector && *selector);
selector_length = strlen (selector);
style_element = webkit_dom_document_get_element_by_id (document, style_sheet_id);
@@ -553,7 +555,7 @@ add_css_rule_into_style_sheet_recursive (WebKitDOMDocument *document,
gint ii, length;
/* Add rule to document */
- add_css_rule_into_style_sheet (
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
document,
style_sheet_id,
selector,
@@ -925,10 +927,212 @@ e_dom_utils_bind_focus_on_elements (WebKitDOMDocument *document,
connection);
}
+static gboolean
+force_width_is_valid_element (WebKitDOMElement *element)
+{
+ gboolean ret_val;
+ gchar *tmp;
+
+ tmp = webkit_dom_element_get_id (element);
+ /* We can force the width on every message that was not formatted
+ * by text-highlight module. */
+ ret_val = tmp && strstr (tmp, "text-highlight");
+ g_free (tmp);
+
+ if (!ret_val)
+ return TRUE;
+
+ tmp = webkit_dom_element_get_attribute (element, "src");
+ /* If the message was formatted with text-highlight we can adjust the
+ * width just for the messages that were formatted as plain text. */
+ ret_val = tmp && strstr (tmp, "__formatas=txt");
+ g_free (tmp);
+
+ return ret_val;
+}
+
+static void
+set_iframe_and_body_width (WebKitDOMDocument *document,
+ gint64 width,
+ gint64 original_width,
+ guint level)
+{
+ gint ii, length;
+ gint64 local_width = width;
+ WebKitDOMHTMLCollection *frames = NULL;
+
+ if (!document || !WEBKIT_DOM_IS_HTML_DOCUMENT (document))
+ return;
+
+ frames = webkit_dom_document_get_elements_by_tag_name_as_html_collection (document, "iframe");
+ length = webkit_dom_html_collection_get_length (frames);
+
+ if (level == 0) {
+ local_width -= 2; /* 1 + 1 frame borders */
+ } else if (!length) {
+ gchar *style;
+
+ /* Message main body */
+ local_width -= 8; /* 8 + 8 margins of body without iframes */
+ if (level > 1)
+ local_width -= 8;
+
+ style = g_strdup_printf ("width: %" G_GINT64_FORMAT "px;", local_width);
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ "body",
+ style);
+
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ ".part-container",
+ style);
+ g_free (style);
+ } else if (level == 1) {
+ gchar *style;
+
+ local_width -= 20; /* 10 + 10 margins of body with iframes */
+
+ style = g_strdup_printf ("width: %" G_GINT64_FORMAT "px;", local_width);
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ "body",
+ style);
+ g_free (style);
+
+ local_width -= 2; /* 1 + 1 frame borders */
+
+ style = g_strdup_printf ("width: %" G_GINT64_FORMAT "px;", local_width);
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ ".part-container-nostyle iframe",
+ style);
+ g_free (style);
+
+ /* We need to subtract another 10 pixels from the iframe width to
+ * have the iframe's borders on the correct place. We can't subtract
+ * it from local_width as we don't want to propagate this change
+ * further. */
+ style = g_strdup_printf ("width: %" G_GINT64_FORMAT "px;", local_width - 10);
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ ".part-container iframe",
+ style);
+ g_free (style);
+ } else {
+ gchar *style;
+
+ local_width -= 20; /* 10 + 10 margins of body with iframes */
+ local_width -= 8; /* attachment margin */
+ local_width -= 2; /* 1 + 1 frame borders */
+
+ /* We need to subtract another 10 pixels from the iframe width to
+ * have the iframe's borders on the correct place. We can't subtract
+ * it from local_width as we don't want to propagate this change
+ * further. */
+ style = g_strdup_printf ("width: %" G_GINT64_FORMAT "px;", local_width - 10);
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ ".part-container-nostyle iframe",
+ style);
+
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ "body > .part-container-nostyle iframe",
+ style);
+ g_free (style);
+ }
+
+ /* Add rules to every sub document */
+ for (ii = 0; ii < length; ii++) {
+ gint64 tmp_local_width = local_width;
+ WebKitDOMDocument *iframe_document;
+ WebKitDOMNode *node;
+
+ node = webkit_dom_html_collection_item (frames, ii);
+ if (!force_width_is_valid_element (WEBKIT_DOM_ELEMENT (node)))
+ continue;
+
+ iframe_document = webkit_dom_html_iframe_element_get_content_document (
+ WEBKIT_DOM_HTML_IFRAME_ELEMENT (node));
+
+ if (!iframe_document)
+ continue;
+
+ if (level == 0) {
+ gchar *style = NULL;
+
+ tmp_local_width -= 8; /* attachment's margin */
+
+ style = g_strdup_printf ("width: %" G_GINT64_FORMAT "px;", tmp_local_width);
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ ".attachment-wrapper iframe:not([src*=\"__formatas=\"])",
+ style);
+
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ ".attachment-wrapper iframe[src*=\"__formatas=txt\"]",
+ style);
+ g_free (style);
+
+ style = g_strdup_printf ("width: %" G_GINT64_FORMAT "px;", local_width);
+ e_dom_utils_add_css_rule_into_style_sheet_in_document (
+ document,
+ "-e-mail-formatter-style-sheet",
+ "body > .part-container-nostyle iframe",
+ style);
+ g_free (style);
+ }
+
+ set_iframe_and_body_width (iframe_document, tmp_local_width, original_width, level + 1);
+ }
+ g_object_unref (frames);
+}
+
+void
+e_dom_resize_document_content_to_preview_width (WebKitDOMDocument *document)
+{
+ gint64 width, scroll_width;
+ WebKitDOMElement *document_element;
+
+ if (!document)
+ return;
+
+ document_element = webkit_dom_document_get_document_element (document);
+ width = webkit_dom_element_get_client_width (document_element);
+
+ /* Check if we have horizontal scrollbar. */
+ scroll_width = webkit_dom_element_get_scroll_width (document_element);
+ if (scroll_width >= width) {
+ width -= 20; /* 10 + 10 margins of body */
+ set_iframe_and_body_width (document, width, width, 0);
+ }
+}
+
+static void
+dom_window_resize_cb (WebKitDOMElement *element,
+ WebKitDOMEvent *event,
+ WebKitDOMDocument *document)
+{
+ e_dom_resize_document_content_to_preview_width (document);
+}
+
void
e_dom_utils_e_mail_display_bind_dom (WebKitDOMDocument *document,
GDBusConnection *connection)
{
+ WebKitDOMDOMWindow *dom_window;
+
e_dom_utils_bind_dom (
document,
"#__evo-collapse-headers-img",
@@ -942,6 +1146,23 @@ e_dom_utils_e_mail_display_bind_dom (WebKitDOMDocument *document,
"click",
toggle_address_visibility,
connection);
+
+ dom_window = webkit_dom_document_get_default_view (document);
+
+ webkit_dom_event_target_add_event_listener (
+ WEBKIT_DOM_EVENT_TARGET (dom_window),
+ "resize",
+ G_CALLBACK (dom_window_resize_cb),
+ FALSE,
+ document);
+
+ e_dom_utils_add_css_rule_into_style_sheet (
+ document,
+ "-e-mail-formatter-style-sheet",
+ "a",
+ "white-space: normal; word-break: break-all;");
+
+ e_dom_resize_document_content_to_preview_width (document);
}
void
diff --git a/src/web-extensions/e-dom-utils.h b/src/web-extensions/e-dom-utils.h
index 5f0d503..0b24cd2 100644
--- a/src/web-extensions/e-dom-utils.h
+++ b/src/web-extensions/e-dom-utils.h
@@ -48,6 +48,11 @@ gchar * e_dom_utils_get_selection_content_multipart
void e_dom_utils_create_and_add_css_style_sheet
(WebKitDOMDocument *document,
const gchar *style_sheet_id);
+void e_dom_utils_add_css_rule_into_style_sheet_in_document
+ (WebKitDOMDocument *document,
+ const gchar *style_sheet_id,
+ const gchar *selector,
+ const gchar *style);
void e_dom_utils_add_css_rule_into_style_sheet
(WebKitDOMDocument *document,
const gchar *style_sheet_id,
@@ -58,6 +63,8 @@ void e_dom_utils_eab_contact_formatter_bind_dom
void e_dom_utils_bind_focus_on_elements
(WebKitDOMDocument *document,
GDBusConnection *connection);
+void e_dom_resize_document_content_to_preview_width
+ (WebKitDOMDocument *document);
void e_dom_utils_e_mail_display_bind_dom
(WebKitDOMDocument *document,
GDBusConnection *connection);
diff --git a/src/web-extensions/e-web-extension.c b/src/web-extensions/e-web-extension.c
index 5966c26..fb43879 100644
--- a/src/web-extensions/e-web-extension.c
+++ b/src/web-extensions/e-web-extension.c
@@ -375,8 +375,9 @@ handle_method_call (GDBusConnection *connection,
if (!element_id || !*element_id) {
g_warn_if_fail (element_id && *element_id);
} else {
- document = webkit_web_page_get_dom_document (web_page);
+ gboolean expand_inner_data = FALSE;
+ document = webkit_web_page_get_dom_document (web_page);
/* A secret short-cut, to not have two functions for basically the same thing ("hide
attachment" and "hide element") */
if (!hidden && g_str_has_prefix (element_id, "attachment-wrapper-")) {
WebKitDOMElement *element;
@@ -387,6 +388,8 @@ handle_method_call (GDBusConnection *connection,
webkit_dom_element_get_child_element_count (element) == 0) {
gchar *inner_html_data;
+ expand_inner_data = TRUE;
+
inner_html_data = webkit_dom_element_get_attribute (element,
"inner-html-data");
if (inner_html_data && *inner_html_data) {
webkit_dom_element_set_inner_html (element, inner_html_data,
NULL);
@@ -398,6 +401,9 @@ handle_method_call (GDBusConnection *connection,
}
e_dom_utils_hide_element (document, element_id, hidden);
+
+ if (expand_inner_data)
+ e_dom_resize_document_content_to_preview_width (document);
}
g_dbus_method_invocation_return_value (invocation, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
