[evolution] Bug 769752 - [WK2] Some CSS styles are missing in the composer
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 769752 - [WK2] Some CSS styles are missing in the composer
- Date: Wed, 5 Oct 2016 09:41:32 +0000 (UTC)
commit c16af1c36bac0b4158de1d42060f2f18a1c702e7
Author: Tomas Popela <tpopela redhat com>
Date: Wed Oct 5 11:40:45 2016 +0200
Bug 769752 - [WK2] Some CSS styles are missing in the composer
modules/webkit-editor/e-webkit-editor.c | 526 ++++++++++++--------
.../web-extension/e-dialogs-dom-functions.c | 52 ++
.../web-extension/e-editor-dom-functions.c | 2 +
.../webkit-editor/web-extension/e-editor-page.c | 31 ++
.../webkit-editor/web-extension/e-editor-page.h | 3 +
.../web-extension/e-editor-web-extension.c | 3 +
6 files changed, 420 insertions(+), 197 deletions(-)
---
diff --git a/modules/webkit-editor/e-webkit-editor.c b/modules/webkit-editor/e-webkit-editor.c
index e285729..7b116f8 100644
--- a/modules/webkit-editor/e-webkit-editor.c
+++ b/modules/webkit-editor/e-webkit-editor.c
@@ -73,6 +73,7 @@ struct _EWebKitEditorPrivate {
guint web_extension_selection_changed_cb_id;
guint web_extension_content_changed_cb_id;
guint web_extension_undo_redo_state_changed_cb_id;
+ guint web_extension_user_changed_default_colors_cb_id;
gboolean html_mode;
gboolean changed;
@@ -89,6 +90,7 @@ struct _EWebKitEditorPrivate {
gboolean copy_cut_actions_triggered;
gboolean pasting_primary_clipboard;
gboolean pasting_from_itself_extension_value;
+ gboolean suppress_color_changes;
guint32 style_flags;
gboolean is_indented;
@@ -427,6 +429,22 @@ web_extension_undo_redo_state_changed_cb (GDBusConnection *connection,
}
static void
+web_extension_user_changed_default_colors_cb (GDBusConnection *connection,
+ const gchar *sender_name,
+ const gchar *object_path,
+ const gchar *interface_name,
+ const gchar *signal_name,
+ GVariant *parameters,
+ EWebKitEditor *wk_editor)
+{
+ if (g_strcmp0 (signal_name, "UserChangedDefaultColors") != 0)
+ return;
+
+ if (parameters)
+ g_variant_get (parameters, "(b)", &wk_editor->priv->suppress_color_changes);
+}
+
+static void
dispatch_pending_operations (EWebKitEditor *wk_editor)
{
if (wk_editor->priv->webkit_load_event != WEBKIT_LOAD_FINISHED ||
@@ -525,6 +543,21 @@ web_extension_proxy_created_cb (GDBusProxy *proxy,
NULL);
}
+ if (wk_editor->priv->web_extension_user_changed_default_colors_cb_id == 0) {
+ wk_editor->priv->web_extension_user_changed_default_colors_cb_id =
+ g_dbus_connection_signal_subscribe (
+ g_dbus_proxy_get_connection (wk_editor->priv->web_extension),
+ g_dbus_proxy_get_name (wk_editor->priv->web_extension),
+ E_WEBKIT_EDITOR_WEB_EXTENSION_INTERFACE,
+ "UserChangedDefaultColors",
+ E_WEBKIT_EDITOR_WEB_EXTENSION_OBJECT_PATH,
+ NULL,
+ G_DBUS_SIGNAL_FLAGS_NONE,
+ (GDBusSignalCallback) web_extension_user_changed_default_colors_cb,
+ wk_editor,
+ NULL);
+ }
+
dispatch_pending_operations (wk_editor);
if (wk_editor->priv->emit_load_finished_when_extension_is_ready) {
@@ -1271,6 +1304,282 @@ webkit_editor_update_styles (EContentEditor *editor)
pango_font_description_free (vw);
}
+static void
+webkit_editor_page_set_text_color (EContentEditor *editor,
+ const GdkRGBA *value)
+{
+ EWebKitEditor *wk_editor;
+ gchar *color;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
+
+ webkit_editor_set_element_attribute (wk_editor, "body", "text", color);
+
+ g_free (color);
+}
+
+static void
+webkit_editor_page_get_text_color (EContentEditor *editor,
+ GdkRGBA *color)
+{
+ EWebKitEditor *wk_editor;
+ GVariant *result;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ if (!wk_editor->priv->html_mode)
+ goto theme;
+
+ result = webkit_editor_get_element_attribute (wk_editor, "body", "text");
+ if (result) {
+ const gchar *value;
+
+ g_variant_get (result, "(&s)", &value);
+ if (!value || !*value || !gdk_rgba_parse (color, value)) {
+ g_variant_unref (result);
+ goto theme;
+ }
+ g_variant_unref (result);
+ return;
+ }
+
+ theme:
+ e_utils_get_theme_color (
+ GTK_WIDGET (wk_editor),
+ "theme_text_color",
+ E_UTILS_DEFAULT_THEME_TEXT_COLOR,
+ color);
+}
+
+static void
+webkit_editor_page_set_background_color (EContentEditor *editor,
+ const GdkRGBA *value)
+{
+ EWebKitEditor *wk_editor;
+ gchar *color;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ if (value->alpha != 0.0)
+ color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
+ else
+ color = g_strdup ("");
+
+ webkit_editor_set_element_attribute (wk_editor, "body", "bgcolor", color);
+
+ g_free (color);
+}
+
+static void
+webkit_editor_page_get_background_color (EContentEditor *editor,
+ GdkRGBA *color)
+{
+ EWebKitEditor *wk_editor;
+ GVariant *result;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ if (!wk_editor->priv->html_mode)
+ goto theme;
+
+ result = webkit_editor_get_element_attribute (wk_editor, "body", "bgcolor");
+ if (result) {
+ const gchar *value;
+
+ g_variant_get (result, "(&s)", &value);
+ if (!value || !*value || !gdk_rgba_parse (color, value)) {
+ g_variant_unref (result);
+ goto theme;
+ }
+ g_variant_unref (result);
+ return;
+ }
+
+ theme:
+ e_utils_get_theme_color (
+ GTK_WIDGET (wk_editor),
+ "theme_base_color",
+ E_UTILS_DEFAULT_THEME_BASE_COLOR,
+ color);
+}
+
+static void
+webkit_editor_page_set_link_color (EContentEditor *editor,
+ const GdkRGBA *value)
+{
+ EWebKitEditor *wk_editor;
+ gchar *color;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
+
+ webkit_editor_set_element_attribute (wk_editor, "body", "link", color);
+
+ g_free (color);
+}
+
+static void
+webkit_editor_page_get_link_color (EContentEditor *editor,
+ GdkRGBA *color)
+{
+ EWebKitEditor *wk_editor;
+ GVariant *result;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ if (!wk_editor->priv->html_mode)
+ goto theme;
+
+ result = webkit_editor_get_element_attribute (wk_editor, "body", "link");
+ if (result) {
+ const gchar *value;
+
+ g_variant_get (result, "(&s)", &value);
+ if (!value || !*value || !gdk_rgba_parse (color, value)) {
+ g_variant_unref (result);
+ goto theme;
+ }
+ g_variant_unref (result);
+ return;
+ }
+
+ theme:
+ color->alpha = 1;
+ color->red = 0;
+ color->green = 0;
+ color->blue = 1;
+}
+
+static void
+webkit_editor_page_set_visited_link_color (EContentEditor *editor,
+ const GdkRGBA *value)
+{
+ EWebKitEditor *wk_editor;
+ gchar *color;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
+
+ webkit_editor_set_element_attribute (wk_editor, "body", "vlink", color);
+
+ g_free (color);
+}
+
+static void
+webkit_editor_page_get_visited_link_color (EContentEditor *editor,
+ GdkRGBA *color)
+{
+ EWebKitEditor *wk_editor;
+ GVariant *result;
+
+ wk_editor = E_WEBKIT_EDITOR (editor);
+
+ if (!wk_editor->priv->html_mode)
+ goto theme;
+
+ result = webkit_editor_get_element_attribute (wk_editor, "body", "vlink");
+ if (result) {
+ const gchar *value;
+
+ g_variant_get (result, "(&s)", &value);
+ if (!value || !*value || !gdk_rgba_parse (color, value)) {
+ g_variant_unref (result);
+ goto theme;
+ }
+ g_variant_unref (result);
+ return;
+ }
+
+ theme:
+ color->alpha = 1;
+ color->red = 1;
+ color->green = 0;
+ color->blue = 0;
+}
+
+static void
+get_color_from_context (GtkStyleContext *context,
+ const gchar *name,
+ GdkRGBA *out_color)
+{
+ GdkColor *color = NULL;
+
+ gtk_style_context_get_style (context, name, &color, NULL);
+
+ if (color == NULL) {
+ gboolean is_visited = strstr (name, "visited") != NULL;
+ #if GTK_CHECK_VERSION(3,12,0)
+ GtkStateFlags state;
+ #endif
+
+ out_color->alpha = 1;
+ out_color->red = is_visited ? 1 : 0;
+ out_color->green = 0;
+ out_color->blue = is_visited ? 0 : 1;
+
+ #if GTK_CHECK_VERSION(3,12,0)
+ state = gtk_style_context_get_state (context);
+ state = state & (~(GTK_STATE_FLAG_VISITED | GTK_STATE_FLAG_LINK));
+ state = state | (is_visited ? GTK_STATE_FLAG_VISITED : GTK_STATE_FLAG_LINK);
+
+ gtk_style_context_save (context);
+ gtk_style_context_set_state (context, state);
+ gtk_style_context_get_color (context, state, out_color);
+ gtk_style_context_restore (context);
+ #endif
+ } else {
+ out_color->alpha = 1;
+ out_color->red = ((gdouble) color->red) / G_MAXUINT16;
+ out_color->green = ((gdouble) color->green) / G_MAXUINT16;
+ out_color->blue = ((gdouble) color->blue) / G_MAXUINT16;
+
+ gdk_color_free (color);
+ }
+}
+
+static void
+webkit_editor_style_updated_cb (EWebKitEditor *wk_editor)
+{
+ GdkRGBA rgba;
+ GtkStateFlags state_flags;
+ GtkStyleContext *style_context;
+ gboolean backdrop;
+
+ /* If the user set the colors in Page dialog, this callback is useless. */
+ if (wk_editor->priv->suppress_color_changes)
+ return;
+
+ state_flags = gtk_widget_get_state_flags (GTK_WIDGET (wk_editor));
+ style_context = gtk_widget_get_style_context (GTK_WIDGET (wk_editor));
+ backdrop = (state_flags & GTK_STATE_FLAG_BACKDROP) != 0;
+
+ if (!gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_base_color" : "theme_base_color",
+ &rgba))
+ gdk_rgba_parse (&rgba, E_UTILS_DEFAULT_THEME_BASE_COLOR);
+
+ webkit_editor_page_set_background_color (E_CONTENT_EDITOR (wk_editor), &rgba);
+
+ if (!gtk_style_context_lookup_color (
+ style_context,
+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color",
+ &rgba))
+ gdk_rgba_parse (&rgba, E_UTILS_DEFAULT_THEME_FG_COLOR);
+
+ webkit_editor_page_set_text_color (E_CONTENT_EDITOR (wk_editor), &rgba);
+
+ get_color_from_context (style_context, "link-color", &rgba);
+ webkit_editor_page_set_link_color (E_CONTENT_EDITOR (wk_editor), &rgba);
+
+ get_color_from_context (style_context, "visited-link-color", &rgba);
+ webkit_editor_page_set_visited_link_color (E_CONTENT_EDITOR (wk_editor), &rgba);
+}
+
static gboolean
webkit_editor_get_html_mode (EWebKitEditor *wk_editor)
{
@@ -1349,6 +1658,7 @@ webkit_editor_set_html_mode (EWebKitEditor *wk_editor,
/* Update fonts - in plain text we only want monospaced */
webkit_editor_update_styles (E_CONTENT_EDITOR (wk_editor));
+ webkit_editor_style_updated_cb (wk_editor);
g_object_notify (G_OBJECT (wk_editor), "html-mode");
}
@@ -3432,203 +3742,6 @@ webkit_editor_get_style_flag (EWebKitEditor *wk_editor,
}
static void
-webkit_editor_page_set_text_color (EContentEditor *editor,
- const GdkRGBA *value)
-{
- EWebKitEditor *wk_editor;
- gchar *color;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
-
- webkit_editor_set_element_attribute (wk_editor, "body", "text", color);
-
- g_free (color);
-}
-
-static void
-webkit_editor_page_get_text_color (EContentEditor *editor,
- GdkRGBA *color)
-{
- EWebKitEditor *wk_editor;
- GVariant *result;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- if (!wk_editor->priv->html_mode)
- goto theme;
-
- result = webkit_editor_get_element_attribute (wk_editor, "body", "text");
- if (result) {
- const gchar *value;
-
- g_variant_get (result, "(&s)", &value);
- if (!value || !*value || !gdk_rgba_parse (color, value)) {
- g_variant_unref (result);
- goto theme;
- }
- g_variant_unref (result);
- return;
- }
-
- theme:
- e_utils_get_theme_color (
- GTK_WIDGET (wk_editor),
- "theme_text_color",
- E_UTILS_DEFAULT_THEME_TEXT_COLOR,
- color);
-}
-
-static void
-webkit_editor_page_set_background_color (EContentEditor *editor,
- const GdkRGBA *value)
-{
- EWebKitEditor *wk_editor;
- gchar *color;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- if (value->alpha != 0.0)
- color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
- else
- color = g_strdup ("");
-
- webkit_editor_set_element_attribute (wk_editor, "body", "bgcolor", color);
-
- g_free (color);
-}
-
-static void
-webkit_editor_page_get_background_color (EContentEditor *editor,
- GdkRGBA *color)
-{
- EWebKitEditor *wk_editor;
- GVariant *result;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- if (!wk_editor->priv->html_mode)
- goto theme;
-
- result = webkit_editor_get_element_attribute (wk_editor, "body", "bgcolor");
- if (result) {
- const gchar *value;
-
- g_variant_get (result, "(&s)", &value);
- if (!value || !*value || !gdk_rgba_parse (color, value)) {
- g_variant_unref (result);
- goto theme;
- }
- g_variant_unref (result);
- return;
- }
-
- theme:
- e_utils_get_theme_color (
- GTK_WIDGET (wk_editor),
- "theme_base_color",
- E_UTILS_DEFAULT_THEME_BASE_COLOR,
- color);
-}
-
-static void
-webkit_editor_page_set_link_color (EContentEditor *editor,
- const GdkRGBA *value)
-{
- EWebKitEditor *wk_editor;
- gchar *color;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
-
- webkit_editor_set_element_attribute (wk_editor, "body", "link", color);
-
- g_free (color);
-}
-
-static void
-webkit_editor_page_get_link_color (EContentEditor *editor,
- GdkRGBA *color)
-{
- EWebKitEditor *wk_editor;
- GVariant *result;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- if (!wk_editor->priv->html_mode)
- goto theme;
-
- result = webkit_editor_get_element_attribute (wk_editor, "body", "link");
- if (result) {
- const gchar *value;
-
- g_variant_get (result, "(&s)", &value);
- if (!value || !*value || !gdk_rgba_parse (color, value)) {
- g_variant_unref (result);
- goto theme;
- }
- g_variant_unref (result);
- return;
- }
-
- theme:
- color->alpha = 1;
- color->red = 0;
- color->green = 0;
- color->blue = 1;
-}
-
-static void
-webkit_editor_page_set_visited_link_color (EContentEditor *editor,
- const GdkRGBA *value)
-{
- EWebKitEditor *wk_editor;
- gchar *color;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- color = g_strdup_printf ("#%06x", e_rgba_to_value (value));
-
- webkit_editor_set_element_attribute (wk_editor, "body", "vlink", color);
-
- g_free (color);
-}
-
-static void
-webkit_editor_page_get_visited_link_color (EContentEditor *editor,
- GdkRGBA *color)
-{
- EWebKitEditor *wk_editor;
- GVariant *result;
-
- wk_editor = E_WEBKIT_EDITOR (editor);
-
- if (!wk_editor->priv->html_mode)
- goto theme;
-
- result = webkit_editor_get_element_attribute (wk_editor, "body", "vlink");
- if (result) {
- const gchar *value;
-
- g_variant_get (result, "(&s)", &value);
- if (!value || !*value || !gdk_rgba_parse (color, value)) {
- g_variant_unref (result);
- goto theme;
- }
- g_variant_unref (result);
- return;
- }
-
- theme:
- color->alpha = 1;
- color->red = 1;
- color->green = 0;
- color->blue = 0;
-}
-
-static void
webkit_editor_on_page_dialog_open (EContentEditor *editor)
{
EWebKitEditor *wk_editor;
@@ -4937,6 +5050,13 @@ webkit_editor_dispose (GObject *object)
priv->web_extension_undo_redo_state_changed_cb_id = 0;
}
+ if (priv->web_extension_user_changed_default_colors_cb_id > 0) {
+ g_dbus_connection_signal_unsubscribe (
+ g_dbus_proxy_get_connection (priv->web_extension),
+ priv->web_extension_user_changed_default_colors_cb_id);
+ priv->web_extension_user_changed_default_colors_cb_id = 0;
+ }
+
if (priv->web_extension_watch_name_id > 0) {
g_bus_unwatch_name (priv->web_extension_watch_name_id);
priv->web_extension_watch_name_id = 0;
@@ -5369,6 +5489,7 @@ webkit_editor_load_changed_cb (EWebKitEditor *wk_editor,
wk_editor->priv->emit_load_finished_when_extension_is_ready = TRUE;
dispatch_pending_operations (wk_editor);
+ webkit_editor_style_updated_cb (wk_editor);
}
static void
@@ -5621,6 +5742,7 @@ webkit_editor_web_process_crashed_cb (EWebKitEditor *wk_editor)
wk_editor->priv->web_extension_selection_changed_cb_id = 0;
wk_editor->priv->web_extension_content_changed_cb_id = 0;
wk_editor->priv->web_extension_undo_redo_state_changed_cb_id = 0;
+ wk_editor->priv->web_extension_user_changed_default_colors_cb_id = 0;
}
static gboolean
@@ -5824,6 +5946,14 @@ e_webkit_editor_init (EWebKitEditor *wk_editor)
wk_editor, "web-process-crashed",
G_CALLBACK (webkit_editor_web_process_crashed_cb), NULL);
+ g_signal_connect (
+ wk_editor, "style-updated",
+ G_CALLBACK (webkit_editor_style_updated_cb), NULL);
+
+ g_signal_connect (
+ wk_editor, "state-flags-changed",
+ G_CALLBACK (webkit_editor_style_updated_cb), NULL);
+
wk_editor->priv->owner_change_primary_clipboard_cb_id = g_signal_connect (
gtk_clipboard_get (GDK_SELECTION_PRIMARY), "owner-change",
G_CALLBACK (webkit_editor_primary_clipboard_owner_change_cb), wk_editor);
@@ -5870,6 +6000,7 @@ e_webkit_editor_init (EWebKitEditor *wk_editor)
wk_editor->priv->pasting_from_itself_extension_value = FALSE;
wk_editor->priv->current_user_stylesheet = NULL;
wk_editor->priv->emit_load_finished_when_extension_is_ready = FALSE;
+ wk_editor->priv->suppress_color_changes = FALSE;
wk_editor->priv->font_color = gdk_rgba_copy (&black);
wk_editor->priv->background_color = gdk_rgba_copy (&white);
@@ -5881,6 +6012,7 @@ e_webkit_editor_init (EWebKitEditor *wk_editor)
wk_editor->priv->web_extension_selection_changed_cb_id = 0;
wk_editor->priv->web_extension_content_changed_cb_id = 0;
wk_editor->priv->web_extension_undo_redo_state_changed_cb_id = 0;
+ wk_editor->priv->web_extension_user_changed_default_colors_cb_id = 0;
}
static void
diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
index ceddce4..82a38c2 100644
--- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
@@ -948,6 +948,49 @@ e_dialogs_dom_page_save_history (EEditorPage *editor_page)
}
}
+static gboolean
+user_changed_content (EEditorHistoryEvent *event)
+{
+ WebKitDOMElement *original, *current;
+ gchar *original_value, *current_value;
+ gboolean changed = TRUE;
+
+ original = WEBKIT_DOM_ELEMENT (event->data.dom.from);
+ current = WEBKIT_DOM_ELEMENT (event->data.dom.to);
+
+ original_value = webkit_dom_element_get_attribute (original, "bgcolor");
+ current_value = webkit_dom_element_get_attribute (current, "bgcolor");
+ changed = g_strcmp0 (original_value, current_value) != 0;
+ g_free (original_value);
+ g_free (current_value);
+ if (changed)
+ return TRUE;
+
+ original_value = webkit_dom_element_get_attribute (original, "text");
+ current_value = webkit_dom_element_get_attribute (current, "text");
+ changed = g_strcmp0 (original_value, current_value) != 0;
+ g_free (original_value);
+ g_free (current_value);
+ if (changed)
+ return TRUE;
+
+ original_value = webkit_dom_element_get_attribute (original, "link");
+ current_value = webkit_dom_element_get_attribute (current, "link");
+ changed = g_strcmp0 (original_value, current_value) != 0;
+ g_free (original_value);
+ g_free (current_value);
+ if (changed)
+ return TRUE;
+
+ original_value = webkit_dom_element_get_attribute (original, "vlink");
+ current_value = webkit_dom_element_get_attribute (current, "vlink");
+ changed = g_strcmp0 (original_value, current_value) != 0;
+ g_free (original_value);
+ g_free (current_value);
+
+ return changed;
+}
+
void
e_dialogs_dom_page_save_history_on_exit (EEditorPage *editor_page)
{
@@ -965,6 +1008,15 @@ e_dialogs_dom_page_save_history_on_exit (EEditorPage *editor_page)
body = webkit_dom_document_get_body (document);
ev->data.dom.to = g_object_ref (webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (body), FALSE,
NULL));
+ /* If user changed any of page colors we have to mark it to send
+ * the correct colors and to disable the color changes when the
+ * view i.e. not focused (at it would overwrite these user set colors. */
+ if (user_changed_content (ev)) {
+ webkit_dom_element_set_attribute (
+ WEBKIT_DOM_ELEMENT (body), "data-user-colors", "", NULL);
+ e_editor_page_emit_user_changed_default_colors (editor_page, TRUE);
+ }
+
if (!webkit_dom_node_is_equal_node (ev->data.dom.from, ev->data.dom.to)) {
e_editor_dom_selection_get_coordinates (editor_page, &ev->after.start.x, &ev->after.start.y,
&ev->after.end.x, &ev->after.end.y);
} else {
diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index 5771d26..a3425d5 100644
--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -7964,6 +7964,8 @@ process_content_to_plain_text_changing_composer_mode (EEditorPage *editor_page)
webkit_dom_element_remove_attribute (
WEBKIT_DOM_ELEMENT (body), "data-user-colors");
+ e_editor_page_emit_user_changed_default_colors (editor_page, FALSE);
+
webkit_dom_element_set_attribute (
WEBKIT_DOM_ELEMENT (body), "data-evo-plain-text", "", NULL);
diff --git a/modules/webkit-editor/web-extension/e-editor-page.c
b/modules/webkit-editor/web-extension/e-editor-page.c
index 7566a30..0ed0cff 100644
--- a/modules/webkit-editor/web-extension/e-editor-page.c
+++ b/modules/webkit-editor/web-extension/e-editor-page.c
@@ -948,3 +948,34 @@ e_editor_page_emit_undo_redo_state_changed (EEditorPage *editor_page)
g_error_free (error);
}
}
+
+void
+e_editor_page_emit_user_changed_default_colors (EEditorPage *editor_page,
+ gboolean suppress_color_changes)
+{
+ GDBusConnection *connection;
+ GError *error = NULL;
+
+ g_return_if_fail (E_IS_EDITOR_PAGE (editor_page));
+
+ if (!editor_page->priv->web_extension)
+ return;
+
+ connection = e_editor_web_extension_get_connection (editor_page->priv->web_extension);
+ if (!connection)
+ return;
+
+ g_dbus_connection_emit_signal (
+ connection,
+ NULL,
+ E_WEBKIT_EDITOR_WEB_EXTENSION_OBJECT_PATH,
+ E_WEBKIT_EDITOR_WEB_EXTENSION_INTERFACE,
+ "UserChangedDefaultColors",
+ g_variant_new ("(b)", suppress_color_changes),
+ &error);
+
+ if (error) {
+ g_warning ("%s: Failed to emit signal: %s", G_STRFUNC, error->message);
+ g_error_free (error);
+ }
+}
diff --git a/modules/webkit-editor/web-extension/e-editor-page.h
b/modules/webkit-editor/web-extension/e-editor-page.h
index 160b9ae..f3cc7ac 100644
--- a/modules/webkit-editor/web-extension/e-editor-page.h
+++ b/modules/webkit-editor/web-extension/e-editor-page.h
@@ -192,6 +192,9 @@ void e_editor_page_emit_content_changed
(EEditorPage *editor_page);
void e_editor_page_emit_undo_redo_state_changed
(EEditorPage *editor_page);
+void e_editor_page_emit_user_changed_default_colors
+ (EEditorPage *editor_page,
+ gboolean suppress_color_changes);
G_END_DECLS
#endif /* E_EDITOR_PAGE_H */
diff --git a/modules/webkit-editor/web-extension/e-editor-web-extension.c
b/modules/webkit-editor/web-extension/e-editor-web-extension.c
index a465f3b..2c25a33 100644
--- a/modules/webkit-editor/web-extension/e-editor-web-extension.c
+++ b/modules/webkit-editor/web-extension/e-editor-web-extension.c
@@ -82,6 +82,9 @@ static const gchar *introspection_xml =
" <arg type='b' name='can_undo' direction='out'/>"
" <arg type='b' name='can_redo' direction='out'/>"
" </signal>"
+" <signal name='UserChangedDefaultColors'>"
+" <arg type='b' name='suppress_color_changes' direction='out'/>"
+" </signal>"
"<!-- ********************************************************* -->"
"<!-- METHODS -->"
"<!-- ********************************************************* -->"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
