Merge lp:~charlesk/ido/lp-898611 into lp:ido/0.3

[Charles Kerr]

The commit message in r104 says it all:

Alter mouse button 2 clicks to behave like mouse button 2 clicks for lp bug #898611.

This solution was taken from gvc-channel-bar.c in gnome-control-center. The idea of cribbing from g-c-c came from Christian Giordano in duplicate lp bug #932919 where he suggested "using the same behavior the volume slider has in the Sound System Settings."

[Lars Karlitski (larsu)]

For the sake of consistency, I'd recommend not doing this kind of change in applications, but in gtk+ itself.

Approving anyway because this fixes a specific bug and changing gtk+ requires more thought. Also, the comment clearly states that this is a hack ;)

I've filed bug #953757 so that we don't lose track of the issue.

Good Work!

review: Approve

=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c	2012-03-10 06:04:36 +0000
+++ src/idoscalemenuitem.c	2012-03-13 04:34:18 +0000
@@ -217,6 +217,21 @@
   priv->toggle_size = toggle_size;
 }
 
+static gboolean
+on_scale_button_press_or_release_event (GtkWidget      * widget G_GNUC_UNUSED, 
+                                        GdkEventButton * event,
+                                        gpointer         unused G_GNUC_UNUSED)
+{
+  /* HACK: we want the behaviour you get with the middle button, so we
+   * mangle the event. clicking with other buttons moves the slider in
+   * step increments, clicking with the middle button moves the slider to
+   * the location of the click. */
+  if (event->button == 1)
+    event->button = 2;
+
+  return FALSE;
+}
+
 static void
 ido_scale_menu_item_constructed (GObject *object)
 {
@@ -235,6 +250,11 @@
   priv->scale = ido_range_new (adj, range_style);
   g_object_ref (priv->scale);
   gtk_scale_set_draw_value (GTK_SCALE (priv->scale), FALSE);
+  g_signal_connect (G_OBJECT (priv->scale), "button-press-event",
+                    G_CALLBACK (on_scale_button_press_or_release_event), NULL);
+  g_signal_connect (G_OBJECT (priv->scale), "button-release-event",
+                    G_CALLBACK (on_scale_button_press_or_release_event), NULL);
+
   
 #ifdef USE_GTK3
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);