[evolution/wip/webkit2] EHTMLEditor - Only display the text properties dialog when some text is selected

[Tomas Popela <tpopela src gnome org>]

commit b16016cbf37707dcf4a3aba73cde5210f949b750
Author: Tomas Popela <tpopela redhat com>
Date:   Tue May 31 12:17:48 2016 +0200

    EHTMLEditor - Only display the text properties dialog when some text is selected

 e-util/e-html-editor.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-html-editor.c b/e-util/e-html-editor.c
index 9784c2f..edf78b5 100644
--- a/e-util/e-html-editor.c
+++ b/e-util/e-html-editor.c
@@ -345,12 +345,15 @@ html_editor_update_actions (EHTMLEditor *editor)
        gtk_action_set_visible (ACTION (CONTEXT_PROPERTIES_RULE), visible);
 
        visible = (flags & E_CONTENT_EDITOR_NODE_IS_TEXT);
-       gtk_action_set_visible (ACTION (CONTEXT_PROPERTIES_TEXT), visible);
+       /* Only display the text properties dialog when some text is selected. */
+       gtk_action_set_visible (
+               ACTION (CONTEXT_PROPERTIES_TEXT),
+               visible && !(flags & E_CONTENT_EDITOR_NODE_IS_TEXT_COLLAPSED));
 
        visible =
                gtk_action_get_visible (ACTION (CONTEXT_PROPERTIES_IMAGE)) ||
                gtk_action_get_visible (ACTION (CONTEXT_PROPERTIES_LINK)) ||
-               gtk_action_get_visible (ACTION (CONTEXT_PROPERTIES_TEXT));
+               visible; /* text node under caret */
        gtk_action_set_visible (ACTION (CONTEXT_PROPERTIES_PARAGRAPH), visible);
 
        /* Set to visible if any of these are true: