Merge lp:~3v1n0/unity/indicator-scroll-nux-sync into lp:unity

[Marco Trevisan (Treviño)]

Scrolling in the indicators: sync with latest Nux changes

A nux area needs SetAcceptMouseWheelEvent(true) to get the
mouse wheel events.

Plus, the nux delta value now is less than 0 when down, and greater
when it's up. Updading the panel service.

Recent Nux changes cause the scroll event over the indicators not to work anymore. This branch fixes it.

[Neil J. Patel (njpatel)]

:)

review: Approve

=== modified file 'plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp'
--- plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-07-22 14:09:55 +0000
+++ plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-07-22 14:09:55 +0000
@@ -66,6 +66,8 @@
 
   InputArea::OnMouseDown.connect(sigc::mem_fun(this, &PanelIndicatorObjectEntryView::OnMouseDown));
   InputArea::OnMouseUp.connect(sigc::mem_fun(this, &PanelIndicatorObjectEntryView::OnMouseUp));
+
+  InputArea::SetAcceptMouseWheelEvent(true);
   InputArea::OnMouseWheel.connect(sigc::mem_fun(this, &PanelIndicatorObjectEntryView::OnMouseWheel));
 
   on_panelstyle_changed_connection_ = PanelStyle::GetDefault()->changed.connect(sigc::mem_fun(this, &PanelIndicatorObjectEntryView::Refresh));

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-07-22 14:09:55 +0000
+++ services/panel-service.c	2011-07-22 14:09:55 +0000
@@ -1179,7 +1179,7 @@
   PanelServicePrivate  *priv = self->priv;
   IndicatorObjectEntry *entry = g_hash_table_lookup (priv->id2entry_hash, entry_id);
   IndicatorObject *object = g_hash_table_lookup (priv->entry2indicator_hash, entry);
-  GdkScrollDirection direction = delta > 0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
+  GdkScrollDirection direction = delta < 0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
 
   g_signal_emit_by_name(object, INDICATOR_OBJECT_SIGNAL_ENTRY_SCROLLED, entry,
                         abs(delta/120), direction);