From 32f222cadb2fed88f111eeb1622802ab684662b2 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Thu, 14 Aug 2014 15:11:53 +0200
Subject: EHTMLEditor - Change the way how the Indent/Unindent and Alignment
 works

Before this change the indent was done with BLOCKQUOTE element. But the
BLOCKQUOTE elements have marings around them set by the HTML engine.
For composer we can override them, but when someone will receive that
HTML message he will have unwanted margin around them. To solve this we
will use the DIV elements instead.
Also for the alignment we switched away from WebKit Editor, but we are
doing it ourselves.
---
 e-util/e-html-editor-view.c | 46 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

(limited to 'e-util/e-html-editor-view.c')

diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 8db6b6b909..0b3212c184 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -5621,7 +5621,7 @@ process_elements (EHTMLEditorView *view,
 			}
 
 			if (to_plain_text && !changing_mode) {
-				gchar *style;
+				gchar *class;
 				const gchar *css_align;
 
 				if (strstr (content, UNICODE_NBSP)) {
@@ -5634,10 +5634,8 @@ process_elements (EHTMLEditorView *view,
 					content = g_string_free (nbsp_free, FALSE);
 				}
 
-				style = webkit_dom_element_get_attribute (
-					WEBKIT_DOM_ELEMENT (node), "style");
-
-				if ((css_align = strstr (style, "text-align: "))) {
+				class = webkit_dom_element_get_class_name (WEBKIT_DOM_ELEMENT (node));
+				if ((css_align = strstr (class, "-x-evo-align-"))) {
 					gchar *align;
 					gchar *content_with_align;
 					gint length;
@@ -5645,12 +5643,15 @@ process_elements (EHTMLEditorView *view,
 						e_html_editor_selection_get_word_wrap_length (
 							e_html_editor_view_get_selection (view));
 
-					if (!g_str_has_prefix (css_align + 12, "left")) {
-						if (g_str_has_prefix (css_align + 12, "center"))
+					if (!g_str_has_prefix (css_align + 13, "left")) {
+						if (g_str_has_prefix (css_align + 13, "center"))
 							length = (word_wrap_length - g_utf8_strlen (content, -1)) / 2;
 						else
 							length = word_wrap_length - g_utf8_strlen (content, -1);
 
+						if (length < 0)
+							length = 0;
+
 						if (g_str_has_suffix (content, " ")) {
 							char *tmp;
 
@@ -5675,7 +5676,7 @@ process_elements (EHTMLEditorView *view,
 					}
 				}
 
-				g_free (style);
+				g_free (class);
 			}
 
 			if (to_plain_text || changing_mode)
@@ -5776,6 +5777,10 @@ process_elements (EHTMLEditorView *view,
 			}
 		}
 
+		if (WEBKIT_DOM_IS_HTML_DIV_ELEMENT (child) &&
+		    element_has_class (WEBKIT_DOM_ELEMENT (child), "-x-evo-indented"))
+			process_blockquote (WEBKIT_DOM_ELEMENT (child));
+
 		if (WEBKIT_DOM_IS_HTMLU_LIST_ELEMENT (child) ||
 		    WEBKIT_DOM_IS_HTMLO_LIST_ELEMENT (child)) {
 			if (to_plain_text) {
@@ -6426,7 +6431,7 @@ process_content_for_plain_text (EHTMLEditorView *view)
 	}
 
 	paragraphs = webkit_dom_element_query_selector_all (
-		WEBKIT_DOM_ELEMENT (source), "body > .-x-evo-paragraph", NULL);
+		WEBKIT_DOM_ELEMENT (source), ".-x-evo-paragraph", NULL);
 
 	length = webkit_dom_node_list_get_length (paragraphs);
 	for (ii = 0; ii < length; ii++) {
@@ -7287,7 +7292,28 @@ e_html_editor_view_update_fonts (EHTMLEditorView *view)
 
 	g_string_append (
 		stylesheet,
-		".-x-evo-list-item-alignt-left "
+		".-x-evo-align-left "
+		"{\n"
+		"  text-align: left; \n"
+		"}\n");
+
+	g_string_append (
+		stylesheet,
+		".-x-evo-align-center "
+		"{\n"
+		"  text-align: center; \n"
+		"}\n");
+
+	g_string_append (
+		stylesheet,
+		".-x-evo-align-right "
+		"{\n"
+		"  text-align: right; \n"
+		"}\n");
+
+	g_string_append (
+		stylesheet,
+		".-x-evo-list-item-align-left "
 		"{\n"
 		"  text-align: left; \n"
 		"}\n");
-- 
cgit v1.2.3