From kde-commits Wed Sep 24 04:12:30 2008 From: Germain Garand Date: Wed, 24 Sep 2008 04:12:30 +0000 To: kde-commits Subject: branches/KDE/4.1/kdelibs/khtml Message-Id: <1222229550.203868.6164.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=122222956003313 SVN commit 864159 by ggarand: automatically merged revision 864151: non-standard scroll event does not bubble in other engines - dont acte. M +1 -1 khtmlview.cpp M +1 -1 rendering/render_layer.cpp --- branches/KDE/4.1/kdelibs/khtml/khtmlview.cpp #864158:864159 @@ -3829,7 +3829,7 @@ } if (m_part->xmlDocImpl() && m_part->xmlDocImpl()->documentElement()) - m_part->xmlDocImpl()->documentElement()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); + m_part->xmlDocImpl()->documentElement()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, false, false); if (!d->smoothScrolling) { d->updateContentsXY(); --- branches/KDE/4.1/kdelibs/khtml/rendering/render_layer.cpp #864158:864159 @@ -731,7 +731,7 @@ } // Fire the scroll DOM event. Do this the very last thing, since the handler may kill us. - m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, true, false); + m_object->element()->dispatchHTMLEvent(EventImpl::SCROLL_EVENT, false, false); } void RenderLayer::updateScrollPositionFromScrollbars()