Merge lp:~bratsche/ido/reverse-scroll-events into lp:ido/0.3

[Cody Russell]

[Cody Russell (bratsche)]

This branch allows the scale menuitem to support reversing scroll events. By default the scrollwheel-up is moving the scale direction to the left and, in indicator-sound, causing the volume to go down.

[Conor Curran (cjcurran)]

Necessary for the indicator-sound spec.

[Conor Curran (cjcurran)]

Necessary for the indicator-sound spec.

review: Approve

=== modified file 'src/idoscalemenuitem.c'
--- src/idoscalemenuitem.c	2010-02-11 23:09:46 +0000
+++ src/idoscalemenuitem.c	2010-02-13 06:46:16 +0000
@@ -66,11 +66,13 @@
   GtkAllocation  child_allocation;
   gdouble        left_padding;
   gdouble        right_padding;
+  gboolean       reverse_scroll;
 };
 
 enum {
   PROP_0,
-  PROP_ADJUSTMENT
+  PROP_ADJUSTMENT,
+  PROP_REVERSE_SCROLL_EVENTS
 };
 
 G_DEFINE_TYPE (IdoScaleMenuItem, ido_scale_menu_item, GTK_TYPE_MENU_ITEM)
@@ -88,7 +90,13 @@
 ido_scale_menu_item_scroll_event (GtkWidget      *menuitem,
                                   GdkEventScroll *event)
 {
-  GtkWidget *scale = GET_PRIVATE (IDO_SCALE_MENU_ITEM (menuitem))->scale;
+  IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
+  GtkWidget *scale = priv->scale;
+
+  if (priv->reverse_scroll)
+    {
+      event->direction = !event->direction;
+    }
 
   gtk_widget_event (scale,
                     ((GdkEvent *)(void*)(event)));
@@ -174,6 +182,14 @@
                                                         GTK_TYPE_ADJUSTMENT,
                                                         G_PARAM_READWRITE));
 
+  g_object_class_install_property (gobject_class,
+                                   PROP_REVERSE_SCROLL_EVENTS,
+                                   g_param_spec_boolean ("reverse-scroll-events",
+                                                         "Reverse scroll events",
+                                                         "Reverses how scroll events are interpreted",
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+
   g_type_class_add_private (object_class, sizeof (IdoScaleMenuItemPrivate));
 }
 
@@ -199,7 +215,10 @@
     {
     case PROP_ADJUSTMENT:
       gtk_range_set_adjustment (GTK_RANGE (priv->scale), g_value_get_object (value));
+      break;
 
+    case PROP_REVERSE_SCROLL_EVENTS:
+      priv->reverse_scroll = g_value_get_boolean (value);
       break;
 
     default:
@@ -224,6 +243,10 @@
       g_value_set_object (value, adjustment);
       break;
 
+    case PROP_REVERSE_SCROLL_EVENTS:
+      g_value_set_boolean (value, priv->reverse_scroll);
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;