[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/unx

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Jun 11 10:24:45 UTC 2020


 vcl/unx/gtk3/gtk3gtkinst.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit a4aadbdd3a3e5549a383ac6dfd2d3e099eef75a0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Jun 11 02:18:38 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Jun 11 12:24:12 2020 +0200

    Revert "gtk3: receive mouse events on drawing area"
    
    It causes a crash when one does Format > Page Style... in Writer on
    desktop LibreOffice (with gtk3).
    
    This reverts commit 2c7cd737007311d81e3801f3ddb7f11362112f07.
    
    Change-Id: I0bc6198f7fd3dff48d8e0614bdefbb30f2214fee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96077
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 1fac0eede611..d8ec90389bce 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -11046,8 +11046,6 @@ public:
         gtk_widget_set_has_tooltip(m_pWidget, true);
         g_object_set_data(G_OBJECT(m_pDrawingArea), "g-lo-GtkInstanceDrawingArea", this);
         m_xDevice->EnableRTL(get_direction());
-        gtk_widget_add_events(m_pWidget, GDK_BUTTON_PRESS_MASK);
-        gtk_widget_add_events(m_pWidget, GDK_BUTTON_RELEASE_MASK);
     }
 
     AtkObject* GetAtkObject(AtkObject* pDefaultAccessible)


More information about the Libreoffice-commits mailing list