summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-12-04 17:31:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-12-05 09:49:34 +0100
commite441e54774d19ee038ffa242b252e81abea68676 (patch)
treedf74f19f8489cd75fefb7869b27f987548a2ec5c /vcl
parent5a73599206916f87c1836af7c4e0a02c28cb9887 (diff)
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 <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx9
1 files changed, 9 insertions, 0 deletions
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)
{