Title: [279580] trunk/Source/WebKit
- Revision
- 279580
- Author
- [email protected]
- Date
- 2021-07-06 04:10:18 -0700 (Tue, 06 Jul 2021)
Log Message
[GTK4] Navigation swipe doesn't work when the page scrolls horizontally
https://bugs.webkit.org/show_bug.cgi?id=226173
Patch by Alexander Mikhaylenko <[email protected]> on 2021-07-06
Reviewed by Michael Catanzaro.
There was a chunk of code that was never ported to GTK4. Port it.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::wheelEventWasNotHandledByWebCore):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (279579 => 279580)
--- trunk/Source/WebKit/ChangeLog 2021-07-06 08:02:10 UTC (rev 279579)
+++ trunk/Source/WebKit/ChangeLog 2021-07-06 11:10:18 UTC (rev 279580)
@@ -1,3 +1,15 @@
+2021-07-06 Alexander Mikhaylenko <[email protected]>
+
+ [GTK4] Navigation swipe doesn't work when the page scrolls horizontally
+ https://bugs.webkit.org/show_bug.cgi?id=226173
+
+ Reviewed by Michael Catanzaro.
+
+ There was a chunk of code that was never ported to GTK4. Port it.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::wheelEventWasNotHandledByWebCore):
+
2021-07-06 Youenn Fablet <[email protected]>
NetworkRTCUDPSocketCocoa should update the port of its m_address field
Modified: trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp (279579 => 279580)
--- trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2021-07-06 08:02:10 UTC (rev 279579)
+++ trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2021-07-06 11:10:18 UTC (rev 279580)
@@ -422,11 +422,11 @@
if (!event.nativeEvent())
return;
-#if !USE(GTK4)
ViewGestureController* controller = webkitWebViewBaseViewGestureController(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
if (controller && controller->isSwipeGestureEnabled()) {
- double deltaX;
- gdk_event_get_scroll_deltas(event.nativeEvent(), &deltaX, nullptr);
+ // While we don't use deltaY, none of the params can be null in GTK4 so we have to pass something.
+ double deltaX, deltaY;
+ gdk_event_get_scroll_deltas(event.nativeEvent(), &deltaX, &deltaY);
int32_t eventTime = static_cast<int32_t>(gdk_event_get_time(event.nativeEvent()));
@@ -441,6 +441,10 @@
}
webkitWebViewBaseForwardNextWheelEvent(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
+
+#if USE(GTK4)
+ gdk_display_put_event(gtk_widget_get_display(m_viewWidget), event.nativeEvent());
+#else
gtk_main_do_event(event.nativeEvent());
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
