Changeset 176539 in webkit

Timestamp:

Nov 25, 2014, 5:48:04 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Minibrowser: Add support for zoom using Control Key + Mouse scroll
​https://bugs.webkit.org/show_bug.cgi?id=138090

Patch by Tanay C <​tanay.c@samsung.com> on 2014-11-25
Reviewed by Carlos Garcia Campos.

• MiniBrowser/gtk/BrowserWindow.c: Implementing zoom using Cntrl + Mouse scroll

(browserWindowZoomIn): Added.
(browserWindowZoomOut): Added.
(scrollEventCallback): Added.
(zoomInCallback): Modified.
(zoomOutCallback): Modified.
(browserWindowConstructed): Modified.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/gtk/BrowserWindow.c (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-25  Tanay C  <tanay.c@samsung.com>
+
+        [GTK] Minibrowser: Add support for zoom using Control Key + Mouse scroll
+        https://bugs.webkit.org/show_bug.cgi?id=138090
+
+        Reviewed by Carlos Garcia Campos.
+
+        * MiniBrowser/gtk/BrowserWindow.c: Implementing zoom using Cntrl + Mouse scroll
+        (browserWindowZoomIn): Added.
+        (browserWindowZoomOut): Added.
+        (scrollEventCallback): Added.
+        (zoomInCallback): Modified.
+        (zoomOutCallback): Modified.
+        (browserWindowConstructed): Modified.
+
 2014-11-25  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

@@ -446 +446 @@
 }
 
+static gboolean browserWindowZoomIn(BrowserWindow *window)
+{
+    if (browserWindowCanZoomIn(window)) {
+        gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) * zoomStep;
+        webkit_web_view_set_zoom_level(window->webView, zoomLevel);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static gboolean browserWindowZoomOut(BrowserWindow *window)
+{
+    if (browserWindowCanZoomOut(window)) {
+        gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) / zoomStep;
+        webkit_web_view_set_zoom_level(window->webView, zoomLevel);
+        return TRUE;
+    }
+    return FALSE;
+}
+
+static gboolean scrollEventCallback(WebKitWebView *webView, const GdkEventScroll *event, BrowserWindow *window)
+{
+    GdkModifierType mod = gtk_accelerator_get_default_mod_mask();
+
+    if ((event->state & mod) != GDK_CONTROL_MASK)
+        return FALSE;
+    
+    if (event->delta_y < 0)
+        return browserWindowZoomIn(window);
+    
+    return browserWindowZoomOut(window);
+}
+
 static void browserWindowUpdateZoomActions(BrowserWindow *window)
 {
@@ -504 +537 @@
 static void zoomInCallback(BrowserWindow *window)
 {
-    if (browserWindowCanZoomIn(window)) {
-        gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) * zoomStep;
-        webkit_web_view_set_zoom_level(window->webView, zoomLevel);
-    }
+    browserWindowZoomIn(window);
 }
 
 static void zoomOutCallback(BrowserWindow *window)
 {
-    if (browserWindowCanZoomOut(window)) {
-        gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) / zoomStep;
-        webkit_web_view_set_zoom_level(window->webView, zoomLevel);
-    }
+    browserWindowZoomOut(window);
 }
 
@@ -782 +809 @@
     g_signal_connect(window->webView, "leave-fullscreen", G_CALLBACK(webViewLeaveFullScreen), window);
     g_signal_connect(window->webView, "notify::is-loading", G_CALLBACK(webViewIsLoadingChanged), window);
+    g_signal_connect(window->webView, "scroll-event", G_CALLBACK(scrollEventCallback), window);
 
     g_signal_connect(webkit_web_view_get_context(window->webView), "download-started", G_CALLBACK(downloadStarted), window);