vcl/unx/gtk3/gtk3gtkinst.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit e441e54774d19ee038ffa242b252e81abea68676
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Dec 4 17:31:22 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Dec 5 09:49:34 2018 +0100
only scroll if the event doesn't come from the page content
Change-Id: I579cef26964aebc89bf6c4786725b4bf85fb4fe5
Reviewed-on: https://gerrit.libreoffice.org/64555
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 862987edfc77..ebf175b3e0eb 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3135,6 +3135,15 @@ private:
bool signal_scroll(GdkEventScroll* event)
{
+ GtkWidget* pEventWidget =
gtk_get_event_widget(reinterpret_cast<GdkEvent*>(event));
+ if (!pEventWidget)
+ return false;
+
+ /* ignore page content scroll events */
+ GtkWidget* pPage = gtk_notebook_get_nth_page(m_pNotebook,
gtk_notebook_get_current_page(m_pNotebook));
+ if (gtk_widget_is_ancestor(pEventWidget, pPage) || pPage ==
pEventWidget)
+ return false;
+
bool bNext(false), bPrev(false);
switch (event->direction)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
