Don't recursively try to handle scroll event logic in nested scroll

nyalldawson · nyalldawson · commit b22edd3e97d9 · 2022-01-25T11:21:54.000+10:00
areas Fixes #46871 (cherry picked from commit f589e6e)
diff --git a/src/gui/qgsscrollarea.cpp b/src/gui/qgsscrollarea.cpp
@@ -144,6 +144,9 @@ void ScrollAreaFilter::addChild( QObject *child )
 {
   if ( child && child->isWidgetType() )
   {
+    if ( qobject_cast< QScrollArea * >( child ) )
+      return;
+
     child->installEventFilter( this );
     if ( QWidget *w = qobject_cast< QWidget * >( child ) )
       w->setMouseTracking( true );
@@ -161,6 +164,9 @@ void ScrollAreaFilter::removeChild( QObject *child )
 {
   if ( child && child->isWidgetType() )
   {
+    if ( qobject_cast< QScrollArea * >( child ) )
+      return;
+
     child->removeEventFilter( this );
 
     // also remove filter on existing children

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,9 @@ void ScrollAreaFilter::addChild( QObject *child )`
`144`	`144`	`{`
`145`	`145`	`if ( child && child->isWidgetType() )`
`146`	`146`	`{`
	`147`	`+ if ( qobject_cast< QScrollArea * >( child ) )`
	`148`	`+ return;`
	`149`	`+`
`147`	`150`	`child->installEventFilter( this );`
`148`	`151`	`if ( QWidget w = qobject_cast< QWidget >( child ) )`
`149`	`152`	`w->setMouseTracking( true );`
`@@ -161,6 +164,9 @@ void ScrollAreaFilter::removeChild( QObject *child )`
`161`	`164`	`{`
`162`	`165`	`if ( child && child->isWidgetType() )`
`163`	`166`	`{`
	`167`	`+ if ( qobject_cast< QScrollArea * >( child ) )`
	`168`	`+ return;`
	`169`	`+`
`164`	`170`	`child->removeEventFilter( this );`
`165`	`171`
`166`	`172`	`// also remove filter on existing children`