[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 363048be0a14b686da8110b96f28a55e25478a89
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Sep 10 19:57:26 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Sep 15 09:56:23 2020 +0200

    tdf#136512 listen to style-updated on pEventWidget instead of toplevel...
    
    m_pWindow to avoid infinite event loop under Linux Mint Mate 18.3
    
    Change-Id: Iaeec4538c7a3c1d49042c4eeb6d30ffc6ab01af8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102416
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 8ca684ca53b7..22ea69f31d7b 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -864,7 +864,8 @@ void GtkSalFrame::InitCommon()
     gtk_widget_set_redraw_on_allocate(GTK_WIDGET(m_pFixedContainer), false);
 
     // connect signals
-    g_signal_connect( G_OBJECT(m_pWindow), "style-updated", G_CALLBACK(signalStyleUpdated), this );
+    // use pEventWidget instead of m_pWindow to avoid infinite event loop under Linux Mint Mate 18.3
+    g_signal_connect( G_OBJECT(pEventWidget), "style-updated", G_CALLBACK(signalStyleUpdated), this );
     gtk_widget_set_has_tooltip(pEventWidget, true);
     m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "query-tooltip", G_CALLBACK(signalTooltipQuery), this ));
     m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget), "button-press-event", G_CALLBACK(signalButton), this ));