From 2c9fc0f3af7a51f1fead38c65706604022663b5f Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Sun, 7 Oct 2012 19:19:54 +0200 Subject: EphyWindow: don't connect to scroll-event on the web view Doing so prevents the correct delivery of scroll DOM events, and at time causes the wrong part of the page to scroll (or none at all). https://bugzilla.gnome.org/show_bug.cgi?id=684243 --- src/ephy-window.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/ephy-window.c b/src/ephy-window.c index 1282bc1d3..4fd14a9f7 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -857,24 +857,6 @@ ephy_window_unfullscreen (EphyWindow *window) ephy_embed_leaving_fullscreen (window->priv->active_embed); } -static gboolean -scroll_event_cb (GtkWidget *widget, - GdkEventScroll *event, - EphyWindow *window) -{ - guint modifier = event->state & gtk_accelerator_get_default_mod_mask (); - - if (modifier != GDK_CONTROL_MASK) - return FALSE; - - if (event->direction == GDK_SCROLL_UP) - ephy_window_set_zoom (window, ZOOM_IN); - else if (event->direction == GDK_SCROLL_DOWN) - ephy_window_set_zoom (window, ZOOM_OUT); - - return TRUE; -} - static gboolean ephy_window_key_press_event (GtkWidget *widget, GdkEventKey *event) @@ -2818,15 +2800,7 @@ ephy_window_connect_active_embed (EphyWindow *window) g_signal_connect_object (web_view, "notify::zoom-level", G_CALLBACK (sync_tab_zoom), window, 0); - /* FIXME: we should set our own handler for - scroll-event, but right now it's pointless because - GtkScrolledWindow will eat all the events, even - those with modifier keys we want to catch to zoom - in and out. See bug #562630 - */ - g_signal_connect_object (web_view, "scroll-event", - G_CALLBACK (scroll_event_cb), - window, 0); + #ifdef HAVE_WEBKIT2 g_signal_connect_object (web_view, "create", G_CALLBACK (create_web_view_cb), @@ -2933,9 +2907,6 @@ ephy_window_disconnect_active_embed (EphyWindow *window) g_signal_handlers_disconnect_by_func (web_view, G_CALLBACK (sync_tab_zoom), window); - g_signal_handlers_disconnect_by_func (web_view, - G_CALLBACK (scroll_event_cb), - window); g_signal_handlers_disconnect_by_func (web_view, G_CALLBACK (create_web_view_cb), window); -- cgit v1.2.3