Merge lp:~3v1n0/libindicator/horizontal-scrolling into lp:libindicator/14.04

[Marco Trevisan (Treviño)]

IndicatorNG: Reverse the scroll delta on left scroll events

As it happens for left scroll events.

Backporting lp:~3v1n0/libindicator/horizontal-scrolling/+merge/227030 to trusty

[Charles Kerr (charlesk)]

LGTM

review: Approve

[lp:~3v1n0/libindicator/horizontal-scrolling]

533. By Marco Trevisan (Treviño) on 2014-10-07

debian/changelog: add bug statement

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-02 14:50:54 +0000
+++ debian/changelog	2014-10-07 15:22:02 +0000
@@ -1,3 +1,9 @@
+libindicator (12.10.2+14.04.20141007-0ubuntu1) UNRELEASED; urgency=low
+
+  * IndicatorNG: Reverse the scroll delta on left scroll events (LP: #1342731)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 07 Oct 2014 17:17:25 +0200
+
 libindicator (12.10.2+14.04.20140402-0ubuntu1) trusty; urgency=low
 
   [ William Hua ]

=== modified file 'libindicator/indicator-ng.c'
--- libindicator/indicator-ng.c	2014-01-29 13:16:59 +0000
+++ libindicator/indicator-ng.c	2014-10-07 15:22:02 +0000
@@ -194,8 +194,12 @@
 
   if (self->actions && self->scroll_action)
     {
-      if (direction == INDICATOR_OBJECT_SCROLL_DOWN)
-        delta *= -1;
+      if (direction == INDICATOR_OBJECT_SCROLL_DOWN ||
+          direction == INDICATOR_OBJECT_SCROLL_LEFT)
+        {
+          delta *= -1;
+        }
+
       g_action_group_activate_action (self->actions, self->scroll_action,
                                       g_variant_new_int32 (delta));
     }

=== modified file 'tools/indicator-loader.c'
--- tools/indicator-loader.c	2013-07-26 17:32:08 +0000
+++ tools/indicator-loader.c	2014-10-07 15:22:02 +0000
@@ -55,6 +55,50 @@
     }
 }
 
+static void
+scroll_entry (GtkWidget *widget, GdkEventScroll* event, gpointer user_data)
+{
+  gpointer entry;
+
+  g_return_if_fail (INDICATOR_IS_OBJECT(user_data));
+
+  entry = g_object_get_qdata (G_OBJECT(widget), entry_data_quark());
+  IndicatorScrollDirection direction = G_MAXINT;
+
+  switch (event->direction)
+    {
+      case GDK_SCROLL_UP:
+        direction = INDICATOR_OBJECT_SCROLL_UP;
+        break;
+      case GDK_SCROLL_DOWN:
+        direction = INDICATOR_OBJECT_SCROLL_DOWN;
+        break;
+      case GDK_SCROLL_LEFT:
+        direction = INDICATOR_OBJECT_SCROLL_LEFT;
+        break;
+      case GDK_SCROLL_RIGHT:
+        direction = INDICATOR_OBJECT_SCROLL_RIGHT;
+        break;
+      default:
+        break;
+    }
+
+  if (entry == NULL)
+    {
+      g_debug("Scroll on: (null)");
+    }
+  else if (direction == G_MAXINT)
+    {
+      g_debug("Scroll direction not supported");
+    }
+  else
+    {
+      g_signal_emit_by_name(INDICATOR_OBJECT(user_data),
+                            INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED,
+                            entry, 1, direction);
+    }
+}
+
 static GtkWidget*
 create_menu_item (IndicatorObjectEntry * entry)
 {
@@ -106,6 +150,9 @@
       g_object_set_qdata (G_OBJECT(menu_item), entry_data_quark(), entry);
       g_signal_connect (menu_item, "activate", G_CALLBACK(activate_entry), io);
 
+      gtk_widget_set_events (menu_item, gtk_widget_get_events (menu_item) | GDK_SCROLL_MASK);
+      g_signal_connect (menu_item, "scroll-event", G_CALLBACK(scroll_entry), io);
+
       gtk_menu_shell_append (GTK_MENU_SHELL(user_data), menu_item);
     }