[Xfce4-commits] <midori:master> Left mouse button and mouse wheel changes zoom level

[Christian Dywan]

Updating branch refs/heads/master
         to c2e0342bb395e65bdb895599f3744a82bfaebdc4 (commit)
       from 09a92c16bbd48635582e423e0ca9e1fa3913c7d3 (commit)

commit c2e0342bb395e65bdb895599f3744a82bfaebdc4
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Apr 10 22:43:05 2011 +0200

    Left mouse button and mouse wheel changes zoom level
    
    The left mouse button behaves identical to Control.

 midori/midori-view.c |    3 ++-
 midori/sokoke.h      |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 0481f5c..a476993 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1722,7 +1722,8 @@ midori_view_ensure_link_uri (MidoriView* view,
 }
 
 #define MIDORI_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK \
-    | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK )
+    | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK \
+    | GDK_BUTTON1_MASK)
 
 static gboolean
 gtk_widget_button_press_event_cb (WebKitWebView*  web_view,
diff --git a/midori/sokoke.h b/midori/sokoke.h
index e76a914..de20a40 100644
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -17,7 +17,8 @@
 #define MIDORI_MOD_NEW_WINDOW(state) (state & GDK_SHIFT_MASK)
 #define MIDORI_MOD_NEW_TAB(state) (state & GDK_CONTROL_MASK)
 #define MIDORI_MOD_BACKGROUND(state) (state & GDK_SHIFT_MASK)
-#define MIDORI_MOD_SCROLL(state) (state & GDK_CONTROL_MASK)
+#define MIDORI_MOD_SCROLL(state) (state & GDK_CONTROL_MASK) \
+                              || (state & GDK_BUTTON1_MASK)
 
 #include <katze/katze.h>