From e53d6dd2ee9dd5bf8aed0f84cc9ef198b7ccd606 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 11 Sep 2015 11:27:08 +0200 Subject: [PATCH 107/398] lokdocview: GTK+ calls should be made from the main thread Change-Id: Ia76ef111170700ef507550222ca917986d4fe00e (cherry picked from commit 88b6dd3ea77ca9f6d5fac2965cea6ff0634e6ba5) --- libreofficekit/source/gtk/lokdocview.cxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 83bb8b5e0aa5..27d2e1df983a 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -368,6 +368,16 @@ hyperlinkClicked(LOKDocView* pDocView, const std::string& rString) g_signal_emit(pDocView, doc_view_signals[HYPERLINK_CLICKED], 0, rString.c_str()); } +/// Trigger a redraw, invoked on the main thread by other functions running in a thread. +static gboolean queueDraw(gpointer pData) +{ + GtkWidget* pWidget = static_cast(pData); + + gtk_widget_queue_draw(pWidget); + + return G_SOURCE_REMOVE; +} + /// Implementation of the global callback handler, invoked by globalCallback(); static gboolean globalCallback (gpointer pData) @@ -1249,7 +1259,7 @@ setEditInThread(gpointer data) } priv->m_bEdit = bEdit; g_signal_emit(pDocView, doc_view_signals[EDIT_CHANGED], 0, bWasEdit); - gtk_widget_queue_draw(GTK_WIDGET(pDocView)); + gdk_threads_add_idle(queueDraw, GTK_WIDGET(pDocView)); } static void @@ -1305,7 +1315,7 @@ paintTileInThread (gpointer data) //create a mapping for it buffer.m_mTiles[index].setPixbuf(pPixBuf); buffer.m_mTiles[index].valid = true; - gtk_widget_queue_draw(GTK_WIDGET(pDocView)); + gdk_threads_add_idle(queueDraw, GTK_WIDGET(pDocView)); } -- 2.12.0