Merge lp:~larsu/ido/fix-volume-slider into lp:ido/15.04

[Lars Karlitski]

idoscalemenuitem: fix slider event forwarding

idoscalemenuitem: fix slider event forwarding

The slider behaves weirdly when clicking/dragging it right now. This patch fixes that.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/ido-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/ido-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ido-ci/70/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Looks nice, thanks!

review: Approve

=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c	2014-03-12 17:25:55 +0000
+++ src/idoscalemenuitem.c	2015-01-21 18:25:20 +0000
@@ -437,20 +437,6 @@
     }
 }
 
-static void
-ido_scale_menu_item_get_scale_allocation (IdoScaleMenuItem *menuitem,
-                                          GtkAllocation    *allocation)
-{
-  IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
-  GtkAllocation parent_allocation;
-
-  gtk_widget_get_allocation (GTK_WIDGET (menuitem), &parent_allocation);
-  gtk_widget_get_allocation (priv->scale, allocation);
-
-  allocation->x -= parent_allocation.x;
-  allocation->y -= parent_allocation.y;
-}
-
 static gboolean
 ido_scale_menu_item_parent_key_press_event (GtkWidget   *widget,
                                             GdkEventKey *event,
@@ -506,19 +492,13 @@
 {
   IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
   GtkAllocation alloc;
-
-  ido_scale_menu_item_get_scale_allocation (IDO_SCALE_MENU_ITEM (menuitem), &alloc);
-
-  // can we block emissions of "grab-notify" on parent??
-
-  event->x -= alloc.x;
-  event->y -= alloc.y;
-
-  event->x_root -= alloc.x;
-  event->y_root -= alloc.y;
-
-  gtk_widget_event (priv->scale,
-                    ((GdkEvent *)(void*)(event)));
+  gint x, y;
+
+  gtk_widget_get_allocation (priv->scale, &alloc);
+  gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y, &x, &y);
+
+  if (x > 0 && x < alloc.width && y > 0 && y < alloc.height)
+    gtk_widget_event (priv->scale, (GdkEvent *) event);
 
   if (!priv->grabbed)
     {
@@ -526,7 +506,7 @@
       g_signal_emit (menuitem, signals[SLIDER_GRABBED], 0);
     }
 
-  return FALSE;
+  return TRUE;
 }
 
 static gboolean
@@ -537,11 +517,13 @@
   IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
   GtkWidget *scale = priv->scale;
   GtkAllocation alloc;
+  gint x, y;
 
-  ido_scale_menu_item_get_scale_allocation (IDO_SCALE_MENU_ITEM (menuitem), &alloc);
+  gtk_widget_get_allocation (priv->scale, &alloc);
+  gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y, &x, &y);
 
   /* if user clicked to the left of the scale... */
-  if (event->x < alloc.x)
+  if (x < 0)
     {
       if (gtk_widget_get_direction (menuitem) == GTK_TEXT_DIR_LTR)
         {
@@ -554,7 +536,7 @@
     }
 
   /* if user clicked to the right of the scale... */
-  else if (event->x > alloc.x + alloc.width)
+  else if (x > alloc.width)
     {
       if (gtk_widget_get_direction (menuitem) == GTK_TEXT_DIR_LTR)
         {
@@ -567,15 +549,9 @@
     }
 
   /* user clicked on the scale... */
-  else
+  else if (x > 0 && x < alloc.width && y > 0 && y < alloc.height)
     {
-      event->x -= alloc.x;
-      event->y -= alloc.y;
-
-      event->x_root -= alloc.x;
-      event->y_root -= alloc.y;
-
-      gtk_widget_event (scale, (GdkEvent*)event);
+      gtk_widget_event (scale, (GdkEvent*) event);
     }
 
   if (priv->grabbed)
@@ -592,19 +568,15 @@
                                          GdkEventMotion *event)
 {
   IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
-  GtkWidget *scale = priv->scale;
   GtkAllocation alloc;
-
-  ido_scale_menu_item_get_scale_allocation (IDO_SCALE_MENU_ITEM (menuitem), &alloc);
-
-  event->x -= alloc.x;
-  event->y -= alloc.y;
-
-  event->x_root -= alloc.x;
-  event->y_root -= alloc.y;
-
-  gtk_widget_event (scale,
-                    ((GdkEvent *)(void*)(event)));
+  gint x, y;
+
+  gtk_widget_get_allocation (priv->scale, &alloc);
+  gtk_widget_translate_coordinates (menuitem, priv->scale, event->x, event->y, &x, &y);
+
+  if (priv->grabbed ||
+      (x > 0 && x < alloc.width && y > 0 && y < alloc.height))
+    gtk_widget_event (priv->scale, (GdkEvent *) event);
 
   return TRUE;
 }