<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176539] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176539">176539</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-25 05:48:04 -0800 (Tue, 25 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsergtkBrowserWindowc">trunk/Tools/MiniBrowser/gtk/BrowserWindow.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176538 => 176539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-25 09:59:38 UTC (rev 176538)
+++ trunk/Tools/ChangeLog 2014-11-25 13:48:04 UTC (rev 176539)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-11-25 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] REGRESSION(r176514): It made performance tests fail
</span></span></pre></div>
<a id="trunkToolsMiniBrowsergtkBrowserWindowc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (176538 => 176539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-11-25 09:59:38 UTC (rev 176538)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-11-25 13:48:04 UTC (rev 176539)
</span><span class="lines">@@ -445,6 +445,39 @@
</span><span class="cx"> return zoomLevel > minimumZoomLevel;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> static void browserWindowUpdateZoomActions(BrowserWindow *window)
</span><span class="cx"> {
</span><span class="cx"> gtk_widget_set_sensitive(window->zoomInItem, browserWindowCanZoomIn(window));
</span><span class="lines">@@ -503,18 +536,12 @@
</span><span class="cx">
</span><span class="cx"> static void zoomInCallback(BrowserWindow *window)
</span><span class="cx"> {
</span><del>- if (browserWindowCanZoomIn(window)) {
- gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) * zoomStep;
- webkit_web_view_set_zoom_level(window->webView, zoomLevel);
- }
</del><ins>+ browserWindowZoomIn(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void zoomOutCallback(BrowserWindow *window)
</span><span class="cx"> {
</span><del>- if (browserWindowCanZoomOut(window)) {
- gdouble zoomLevel = webkit_web_view_get_zoom_level(window->webView) / zoomStep;
- webkit_web_view_set_zoom_level(window->webView, zoomLevel);
- }
</del><ins>+ browserWindowZoomOut(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void defaultZoomCallback(BrowserWindow *window)
</span><span class="lines">@@ -781,6 +808,7 @@
</span><span class="cx"> g_signal_connect(window->webView, "enter-fullscreen", G_CALLBACK(webViewEnterFullScreen), window);
</span><span class="cx"> g_signal_connect(window->webView, "leave-fullscreen", G_CALLBACK(webViewLeaveFullScreen), window);
</span><span class="cx"> g_signal_connect(window->webView, "notify::is-loading", G_CALLBACK(webViewIsLoadingChanged), window);
</span><ins>+ g_signal_connect(window->webView, "scroll-event", G_CALLBACK(scrollEventCallback), window);
</ins><span class="cx">
</span><span class="cx"> g_signal_connect(webkit_web_view_get_context(window->webView), "download-started", G_CALLBACK(downloadStarted), window);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>