Merge lp:~kalikiana/midori/dodge into lp:midori

[Cris Dywan]

Flip horizontal position of the overlay when hit by the mouse

This change makes the overlay label flip the side if the mouse hits it, easy and effective.

Note that depending on the situation the overlay label may hide after flipping until hitting the next link. It looks a bit glitchy but the underlying stuff can be read, so I think it's a fairly small concern compared to without the flipping.

[André Stösel (ivaldi)]

review: Approve

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-09-08 17:20:49 +0000
+++ midori/midori-view.c	2013-09-14 16:09:48 +0000
@@ -1520,6 +1520,20 @@
 }
 #endif
 
+#if GTK_CHECK_VERSION(3, 2, 0)
+static gboolean
+midori_view_overlay_frame_enter_notify_event_cb (GtkOverlay*       overlay,
+                                                 GdkEventCrossing* event,
+                                                 GtkWidget*        frame)
+{
+    /* Flip horizontal position of the overlay frame */
+    gtk_widget_set_halign (frame,
+        gtk_widget_get_halign (frame) == GTK_ALIGN_START
+        ? GTK_ALIGN_END : GTK_ALIGN_START);
+    return FALSE;
+}
+#endif
+
 static gboolean
 midori_view_web_view_leave_notify_event_cb (WebKitWebView*    web_view,
                                             GdkEventCrossing* event,
@@ -3597,6 +3611,10 @@
     gtk_widget_set_halign (frame, GTK_ALIGN_START);
     gtk_widget_set_valign (frame, GTK_ALIGN_END);
     gtk_overlay_add_overlay (GTK_OVERLAY (view->overlay), frame);
+    /* Enable enter-notify-event signals */
+    gtk_widget_add_events (view->overlay, GDK_ENTER_NOTIFY_MASK);
+    g_signal_connect (view->overlay, "enter-notify-event",
+        G_CALLBACK (midori_view_overlay_frame_enter_notify_event_cb), frame);
     }
     view->overlay_find = g_object_new (MIDORI_TYPE_FINDBAR, NULL);
     gtk_widget_set_halign (view->overlay_find, GTK_ALIGN_END);