Changeset 30060 in webkit

Timestamp:

Feb 6, 2008 8:12:36 PM (16 years ago)

Author:

kevino@webkit.org

Message:

Switch from directly handling wx scroll wheel events to handling the PlatformWheelEvent instead to give JS, etc. a chance to handle it.
​http://bugs.webkit.org/show_bug.cgi?id=17179

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ScrollView.h (modified) (1 diff)
• platform/wx/MouseWheelEventWx.cpp (modified) (1 diff)
• platform/wx/ScrollViewWx.cpp (modified) (12 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-06  Kevin Ollivier  <kevino@theolliviers.com>
+
+        Reviewed by Darin Adler.
+
+        Rather than directly handing scroll wheel events, use
+        PlatformWheelEvent to send them to WebCore first, so that
+        mouse wheel scrolling info can be retrieved via JavaScript.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17179
+
+        * platform/ScrollView.h:
+        * platform/wx/MouseWheelEventWx.cpp:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+        * platform/wx/ScrollViewWx.cpp:
+        (WebCore::ScrollView::ScrollViewPrivate::bindEvents):
+        (WebCore::ScrollView::wheelEvent):
+        (WebCore::ScrollView::maximumScroll):
+
 2008-02-06  Mark Rowe  <mrowe@apple.com>
 

trunk/WebCore/platform/ScrollView.h

@@ -231 +231 @@
     private:
         void adjustScrollbars(int x = -1, int y = -1, bool refresh = true);
+        IntSize maximumScroll() const;
 
         class ScrollViewPrivate;

trunk/WebCore/platform/wx/MouseWheelEventWx.cpp

@@ -40 +40 @@
     , m_metaKey(event.MetaDown()) // FIXME: We'll have to test other browsers
     , m_deltaX(0) // wx doesn't support horizontal mouse wheel scrolling
-    , m_deltaY(event.GetWheelRotation())
+    , m_deltaY(event.GetWheelRotation() / event.GetWheelDelta())
 {
 

trunk/WebCore/platform/wx/ScrollViewWx.cpp

@@ -30 +30 @@
 #include "IntRect.h"
 #include "NotImplemented.h"
+#include "PlatformWheelEvent.h"
 #include "ScrollBar.h"
 
@@ -69 +70 @@
         win->Connect(wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEventHandler(ScrollViewPrivate::OnScrollWinEvents), NULL, this);
         win->Connect(wxEVT_SCROLLWIN_TOP,          wxScrollWinEventHandler(ScrollViewPrivate::OnScrollWinEvents), NULL, this);
-        win->Connect(wxEVT_MOUSEWHEEL,             wxMouseEventHandler(ScrollViewPrivate::OnMouseWheelEvents), NULL, this);
     }
     
-    void OnMouseWheelEvents(wxMouseEvent& event)
-    {
-        // TODO: Get wx to report X and Y rotation so we can support mighty mouse, etc.
-        m_scrollView->scrollBy(0, -event.GetWheelRotation() * LINE_STEP);
-    }
-
     void OnScrollWinEvents(wxScrollWinEvent& e)
     {
@@ -112 +106 @@
     ScrollView* m_scrollView;
 
-    IntSize scrollOffset;
-    IntSize contentsSize;
     HashSet<Widget*> m_children;
     bool hasStaticBackground;
@@ -165 +157 @@
         win->GetClientSize(&width, NULL);
     
+    ASSERT(width >= 0);
     return width;
 }
@@ -175 +168 @@
         win->GetClientSize(NULL, &height);
     
+    ASSERT(height >= 0);
     return height;
 }
@@ -240 +234 @@
 int ScrollView::contentsX() const
 {
+    ASSERT(m_data->viewStart.x >= 0);
     return m_data->viewStart.x;
 }
@@ -245 +240 @@
 int ScrollView::contentsY() const
 {
+    ASSERT(m_data->viewStart.y >= 0);
     return m_data->viewStart.y;
 }
@@ -254 +250 @@
     if (win)
         win->GetVirtualSize(&width, NULL);
+    ASSERT(width >= 0);
     return width;
 }
@@ -263 +260 @@
     if (win)
         win->GetVirtualSize(NULL, &height);
+    ASSERT(height >= 0);
     return height;
 }
@@ -405 +403 @@
 }
 
-void ScrollView::wheelEvent(PlatformWheelEvent&)
-{
-    // do nothing,
-    // FIXME: not sure if any ports need to handle this, actually...
+void ScrollView::wheelEvent(PlatformWheelEvent& e)
+{
+    // Determine how much we want to scroll.  If we can move at all, we will accept the event.
+    IntSize maxScrollDelta = maximumScroll();
+    if ((e.deltaX() < 0 && maxScrollDelta.width() > 0) ||
+        (e.deltaX() > 0 && scrollOffset().width() > 0) ||
+        (e.deltaY() < 0 && maxScrollDelta.height() > 0) ||
+        (e.deltaY() > 0 && scrollOffset().height() > 0)) {
+        e.accept();
+        scrollBy(-e.deltaX() * LINE_STEP, -e.deltaY() * LINE_STEP);
+    }
 }
 
@@ -445 +450 @@
 }
 
-
 PlatformScrollbar* ScrollView::scrollbarUnderMouse(const PlatformMouseEvent& mouseEvent)
 {
@@ -453 +457 @@
 }
 
-
-}
+IntSize ScrollView::maximumScroll() const
+{
+    IntSize delta = (IntSize(contentsWidth(), contentsHeight()) - IntSize(visibleWidth(), visibleHeight())) - scrollOffset();
+    delta.clampNegativeToZero();
+    return delta;
+}
+
+}