Changeset 48735 in webkit

Timestamp:

Sep 24, 2009 2:58:59 PM (15 years ago)

Author:

kov@webkit.org

Message:

Implement correct horizontal scrollbar behavior for GTK+

WebCore

2009-09-24 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Oliver Hunt.

Implement correct horizontal scrollbar behavior for GTK+ also on
styled scrollbars.

​https://bugs.webkit.org/show_bug.cgi?id=29348
[Gtk] Scrollwheel on horizontal scrollbars should slide horizontally

Test: platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html

• page/EventHandler.cpp: (WebCore::EventHandler::handleWheelEvent): on GTK+, when using the wheel with the pointer on the horizontal scrollbar, scroll horizontally;
• platform/PlatformWheelEvent.h:
• platform/gtk/WheelEventGtk.cpp: (WebCore::PlatformWheelEvent::swapOrientation): allow adding a vertical scroll to the horizontal one;

WebKitTools

2009-09-24 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Oliver Hunt.

Add support for DRT to send mouse wheel events.

​https://bugs.webkit.org/show_bug.cgi?id=29348
[Gtk] Scrollwheel on horizontal scrollbars should slide horizontally

• DumpRenderTree/gtk/EventSender.cpp: (mouseWheelToCallback):

LayoutTests

2009-09-24 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Oliver Hunt.

Test for correct wheel scrolling behavior.

​https://bugs.webkit.org/show_bug.cgi?id=29348
[Gtk] Scrollwheel on horizontal scrollbars should slide horizontally

• platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html: Added.
• platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/scrollbars (added)
• LayoutTests/platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll-expected.txt (added)
• LayoutTests/platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (3 diffs)
• WebCore/page/EventHandler.h (modified) (1 diff)
• WebCore/page/gtk/EventHandlerGtk.cpp (modified) (1 diff)
• WebCore/platform/PlatformWheelEvent.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/gtk/EventSender.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-09-24  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Oliver Hunt.
+
+        Test for correct wheel scrolling behavior.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29348
+        [Gtk] Scrollwheel on horizontal scrollbars should slide horizontally
+
+        * platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html: Added.
+        * platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll-expected.txt: Added.
+
 2009-09-24  Philippe Normand  <pnormand@igalia.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-24  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Oliver Hunt.
+
+        Implement correct horizontal scrollbar behavior for GTK+ also on
+        styled scrollbars.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29348
+        [Gtk] Scrollwheel on horizontal scrollbars should slide horizontally
+
+        Test: platform/gtk/scrollbars/overflow-scrollbar-horizontal-wheel-scroll.html
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleWheelEvent): on GTK+, when using the
+        wheel with the pointer on the horizontal scrollbar, scroll
+        horizontally;
+        * platform/PlatformWheelEvent.h:
+        * platform/gtk/WheelEventGtk.cpp:
+        (WebCore::PlatformWheelEvent::swapOrientation): allow adding a
+        vertical scroll to the horizontal one;
+
 2009-09-24  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/page/EventHandler.cpp

@@ -1759 +1759 @@
 }
 
+#if !PLATFORM(GTK)
+bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result) const
+{
+    return false;
+}
+#endif
+
 bool EventHandler::handleWheelEvent(PlatformWheelEvent& e)
 {
@@ -1778 +1785 @@
     bool didSetLatchedNode = false;
 
+    HitTestRequest request(HitTestRequest::ReadOnly);
+    HitTestResult result(vPoint);
+    doc->renderView()->layer()->hitTest(request, result);
+
     if (m_useLatchedWheelEventNode) {
         if (!m_latchedWheelEventNode) {
-            HitTestRequest request(HitTestRequest::ReadOnly);
-            HitTestResult result(vPoint);
-            doc->renderView()->layer()->hitTest(request, result);
             m_latchedWheelEventNode = result.innerNode();
             m_widgetIsLatched = result.isOverWidget();
@@ -1796 +1804 @@
             m_previousWheelScrolledNode = 0;
 
-        HitTestRequest request(HitTestRequest::ReadOnly);
-        HitTestResult result(vPoint);
-        doc->renderView()->layer()->hitTest(request, result);
         node = result.innerNode();
         isOverWidget = result.isOverWidget();
     }
+
+    if (shouldTurnVerticalTicksIntoHorizontal(result))
+        e.turnVerticalTicksIntoHorizontal();
 
     if (node) {

trunk/WebCore/page/EventHandler.h

@@ -126 +126 @@
 #endif
 
+    bool shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&) const;
+
     bool tabsToLinks(KeyboardEvent*) const;
     bool tabsToAllControls(KeyboardEvent*) const;

trunk/WebCore/page/gtk/EventHandlerGtk.cpp

@@ -123 +123 @@
 }
 
+// GTK+ must scroll horizontally if the mouse pointer is on top of the
+// horizontal scrollbar while scrolling with the wheel; we need to
+// add the deltas and ticks here so that this behavior is consistent
+// for styled scrollbars.
+bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult& result) const
+{
+    return result.scrollbar() && result.scrollbar()->orientation() == HorizontalScrollbar;
 }
+
+}

trunk/WebCore/platform/PlatformWheelEvent.h

@@ -94 +94 @@
         void ignore() { m_isAccepted = false; }
 
+        void turnVerticalTicksIntoHorizontal()
+        {
+            m_deltaX = m_deltaY;
+            m_deltaY = 0;
+
+            m_wheelTicksX = m_wheelTicksY;
+            m_wheelTicksY = 0;
+        }
+
 #if PLATFORM(GTK)
         PlatformWheelEvent(GdkEventScroll*);

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-09-24  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Oliver Hunt.
+
+        Add support for DRT to send mouse wheel events.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29348
+        [Gtk] Scrollwheel on horizontal scrollbars should slide horizontally
+
+        * DumpRenderTree/gtk/EventSender.cpp:
+        (mouseWheelToCallback):
+
 2009-09-17  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/gtk/EventSender.cpp

@@ -228 +228 @@
         gboolean return_val;
         g_signal_emit_by_name(view, "motion_notify_event", &event, &return_val);
+    }
+
+    return JSValueMakeUndefined(context);
+}
+
+static JSValueRef mouseWheelToCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+    WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+    if (!view)
+        return JSValueMakeUndefined(context);
+
+    if (argumentCount < 2)
+        return JSValueMakeUndefined(context);
+
+    int horizontal = (int)JSValueToNumber(context, arguments[0], exception);
+    g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
+    int vertical = (int)JSValueToNumber(context, arguments[1], exception);
+    g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
+
+    // GTK+ doesn't support multiple direction scrolls in the same event!
+    g_return_val_if_fail((!vertical || !horizontal), JSValueMakeUndefined(context));
+
+    GdkEvent event;
+    event.type = GDK_SCROLL;
+    event.scroll.x = lastMousePositionX;
+    event.scroll.y = lastMousePositionY;
+    event.scroll.time = GDK_CURRENT_TIME;
+    event.scroll.window = GTK_WIDGET(view)->window;
+
+    if (horizontal < 0)
+        event.scroll.direction = GDK_SCROLL_LEFT;
+    else if (horizontal > 0)
+        event.scroll.direction = GDK_SCROLL_RIGHT;
+    else if (vertical < 0)
+        event.scroll.direction = GDK_SCROLL_UP;
+    else if (vertical > 0)
+        event.scroll.direction = GDK_SCROLL_DOWN;
+    else
+        g_assert_not_reached();
+
+    if (dragMode && down && !replayingSavedEvents) {
+        msgQueue[endOfQueue].event = event;
+        msgQueue[endOfQueue++].isDragEvent = true;
+    } else {
+        webkit_web_frame_layout(mainFrame);
+        gtk_main_do_event(&event);
     }
 
@@ -444 +490 @@
 
 static JSStaticFunction staticFunctions[] = {
+    { "mouseWheelTo", mouseWheelToCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     { "contextClick", contextClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
     { "mouseDown", mouseDownCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },