Bug 849544/935460, don't consume mousewheel events when an arrow panel is open, r=karlt
authorNeil Deakin <neil@mozilla.com>
Fri, 29 Nov 2013 11:58:26 -0500
changeset 172787 27b8fa30236810268a4df3bd4db199270fc3c200
parent 172786 8cbac89f1929e78c4dceaf9521c442b48d2667b7
child 172788 d9f86fd4fa60ad3eb02031ccf7a10315c1a83f1f
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs849544, 935460
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 849544/935460, don't consume mousewheel events when an arrow panel is open, r=karlt
widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -4750,17 +4750,17 @@ nsWindow::CheckForRollup(gdouble aMouseX
 
     bool retVal = false;
     GdkWindow *currentPopup =
         (GdkWindow *)rollupWidget->GetNativeData(NS_NATIVE_WINDOW);
     if (aAlwaysRollup || !is_mouse_in_window(currentPopup, aMouseX, aMouseY)) {
         bool rollup = true;
         if (aIsWheel) {
             rollup = rollupListener->ShouldRollupOnMouseWheelEvent();
-            retVal = true;
+            retVal = rollupListener->ShouldConsumeOnMouseWheelEvent();
         }
         // if we're dealing with menus, we probably have submenus and
         // we don't want to rollup if the click is in a parent menu of
         // the current submenu
         uint32_t popupsToRollup = UINT32_MAX;
         if (!aAlwaysRollup) {
             nsAutoTArray<nsIWidget*, 5> widgetChain;
             uint32_t sameTypeCount = rollupListener->GetSubmenuWidgetChain(&widgetChain);