[evolution/wip/webkit-composer] Bug #708734 - [webkit-composer] Paragraph indentation keeps soft line breaks from level 0
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer] Bug #708734 - [webkit-composer] Paragraph indentation keeps soft line breaks from level 0
- Date: Fri, 17 Jan 2014 12:27:03 +0000 (UTC)
commit 100b192882884b83a11aaa08edf2ae0b2c8a616a
Author: Tomas Popela <tpopela redhat com>
Date: Fri Jan 17 13:25:07 2014 +0100
Bug #708734 - [webkit-composer] Paragraph indentation keeps soft line breaks from level 0
We need to stop indenting at some point (10 characters left).
e-util/e-editor-selection.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-editor-selection.c b/e-util/e-editor-selection.c
index 7050e89..4454fba 100644
--- a/e-util/e-editor-selection.c
+++ b/e-util/e-editor-selection.c
@@ -1174,7 +1174,7 @@ get_indentation_level (WebKitDOMElement *element)
parent = webkit_dom_node_get_parent_element (WEBKIT_DOM_NODE (element));
/* Count level of indentation */
- while (!WEBKIT_DOM_IS_HTML_BODY_ELEMENT (parent)) {
+ while (parent && !WEBKIT_DOM_IS_HTML_BODY_ELEMENT (parent)) {
if (element_has_class (parent, "-x-evo-indented"))
level++;
@@ -1841,6 +1841,7 @@ e_editor_selection_indent (EEditorSelection *selection)
gint spaces_per_indentation = 4;
gint word_wrap_length = selection->priv->word_wrap_length;
gint level;
+ gint final_width = 0;
document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (editor_widget));
@@ -1858,6 +1859,12 @@ e_editor_selection_indent (EEditorSelection *selection)
level = get_indentation_level (WEBKIT_DOM_ELEMENT (node));
+ final_width = word_wrap_length - spaces_per_indentation * (level + 1);
+ if (final_width < 10) {
+ g_object_unref (editor_widget);
+ return;
+ }
+
element = webkit_dom_node_get_parent_element (node);
clone = webkit_dom_node_clone_node (node, TRUE);
@@ -1868,6 +1875,7 @@ e_editor_selection_indent (EEditorSelection *selection)
element = webkit_dom_document_create_element (document, "BLOCKQUOTE", NULL);
element_add_class (element, "-x-evo-indented");
+
/* We don't want vertical space bellow and above blockquote inserted by
* WebKit's User Agent Stylesheet. We have to override it through style attribute. */
style_value =
@@ -1878,7 +1886,7 @@ e_editor_selection_indent (EEditorSelection *selection)
"width: %dch",
spaces_per_indentation,
spaces_per_indentation,
- word_wrap_length - spaces_per_indentation * level);
+ final_width);
webkit_dom_element_set_attribute (
element,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]