Merge lp:~cimi/overlay-scrollbar/scroll-event-on-thumb into lp:overlay-scrollbar

[Andrea Cimitan]

Handle scroll-wheel event

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-04-05 15:23:15 +0000
+++ os/os-scrollbar.c	2011-04-06 10:57:24 +0000
@@ -27,6 +27,7 @@
 #include "os-scrollbar.h"
 #include "os-private.h"
 #include <gdk/gdkx.h>
+#include "math.h"
 
 /* Default size of the pager in pixels. */
 #define DEFAULT_PAGER_WIDTH 3
@@ -89,6 +90,7 @@
 static gdouble os_scrollbar_coord_to_value (OsScrollbar *scrollbar, gint coord);
 static void os_scrollbar_deactivate_pager (OsScrollbar *scrollbar);
 static gboolean os_scrollbar_deactivate_pager_cb (gpointer user_data);
+static gdouble os_scrollbar_get_wheel_delta (OsScrollbar *scrollbar, GdkScrollDirection direction);
 static void os_scrollbar_hide_thumb (OsScrollbar *scrollbar);
 static gboolean os_scrollbar_hide_thumb_cb (gpointer user_data);
 static gboolean os_scrollbar_unlock_thumb_cb (gpointer user_data);
@@ -107,6 +109,7 @@
 static gboolean thumb_leave_notify_event_cb (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
 static void thumb_map_cb (GtkWidget *widget, gpointer user_data);
 static gboolean thumb_motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, gpointer user_data);
+static gboolean thumb_scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, gpointer user_data);
 static void thumb_unmap_cb (GtkWidget *widget, gpointer user_data);
 static void pager_move (OsScrollbar *scrollbar);
 static void pager_set_state_from_pointer (OsScrollbar *scrollbar, gint x, gint y);
@@ -368,6 +371,24 @@
   return FALSE;
 }
 
+static gdouble
+os_scrollbar_get_wheel_delta (OsScrollbar       *scrollbar,
+                              GdkScrollDirection direction)
+{
+  OsScrollbarPrivate *priv;
+  gdouble delta;
+
+  priv = scrollbar->priv;
+
+  delta = pow (priv->adjustment->page_size, 2.0 / 3.0);
+
+  if (direction == GDK_SCROLL_UP ||
+      direction == GDK_SCROLL_LEFT)
+    delta = - delta;
+
+  return delta;
+}
+
 /* Hide if it's ok to hide. */
 static void
 os_scrollbar_hide_thumb (OsScrollbar *scrollbar)
@@ -628,6 +649,8 @@
       g_signal_handlers_disconnect_by_func (G_OBJECT (priv->thumb),
                                             thumb_motion_notify_event_cb, scrollbar);
       g_signal_handlers_disconnect_by_func (G_OBJECT (priv->thumb),
+                                            thumb_scroll_event_cb, scrollbar);
+      g_signal_handlers_disconnect_by_func (G_OBJECT (priv->thumb),
                                             thumb_unmap_cb, scrollbar);
 
       gtk_widget_destroy (priv->thumb);
@@ -653,6 +676,8 @@
                         G_CALLBACK (thumb_map_cb), scrollbar);
       g_signal_connect (G_OBJECT (priv->thumb), "motion-notify-event",
                         G_CALLBACK (thumb_motion_notify_event_cb), scrollbar);
+      g_signal_connect (G_OBJECT (priv->thumb), "scroll-event",
+                        G_CALLBACK (thumb_scroll_event_cb), scrollbar);
       g_signal_connect (G_OBJECT (priv->thumb), "unmap",
                         G_CALLBACK (thumb_unmap_cb), scrollbar);
     }
@@ -965,6 +990,25 @@
   return FALSE;
 }
 
+static gboolean
+thumb_scroll_event_cb (GtkWidget      *widget,
+                       GdkEventScroll *event,
+                       gpointer        user_data)
+{
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+  gdouble delta;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+  priv = scrollbar->priv;
+
+  delta = os_scrollbar_get_wheel_delta (scrollbar, event->direction);
+
+  gtk_adjustment_set_value (priv->adjustment, priv->adjustment->value + delta);
+
+  return FALSE;
+}
+
 static void
 thumb_unmap_cb (GtkWidget *widget,
                 gpointer   user_data)

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-04-06 09:40:48 +0000
+++ os/os-thumb.c	2011-04-06 10:57:24 +0000
@@ -64,6 +64,7 @@
 static gboolean os_thumb_motion_notify_event (GtkWidget *widget, GdkEventMotion *event);
 static void os_thumb_map (GtkWidget *widget);
 static void os_thumb_screen_changed (GtkWidget *widget, GdkScreen *old_screen);
+static gboolean os_thumb_scroll_event (GtkWidget *widget, GdkEventScroll *event);
 static void os_thumb_unmap (GtkWidget *widget);
 static GObject* os_thumb_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties);
 static void os_thumb_dispose (GObject *object);
@@ -156,6 +157,7 @@
   widget_class->map                  = os_thumb_map;
   widget_class->motion_notify_event  = os_thumb_motion_notify_event;
   widget_class->screen_changed       = os_thumb_screen_changed;
+  widget_class->scroll_event         = os_thumb_scroll_event;
   widget_class->unmap                = os_thumb_unmap;
 
   gobject_class->constructor  = os_thumb_constructor;
@@ -654,6 +656,33 @@
     gtk_widget_set_colormap (widget, colormap);
 }
 
+static gboolean
+os_thumb_scroll_event (GtkWidget      *widget,
+                       GdkEventScroll *event)
+{
+  OsThumb *thumb;
+  OsThumbPrivate *priv;
+
+  thumb = OS_THUMB (widget);
+  priv = thumb->priv;
+
+  /* if started, stop the fade-out. */
+  if (priv->source_id != 0)
+    {
+      g_source_remove (priv->source_id);
+      priv->source_id = 0;
+
+      os_animation_stop (priv->animation);
+      gtk_window_set_opacity (GTK_WINDOW (widget), 1.0f);
+    }
+
+  priv->source_id = g_timeout_add (TIMEOUT_FADE_OUT,
+                                   os_thumb_timeout_fade_out_cb,
+                                   thumb);
+
+  return FALSE;
+}
+
 static void
 os_thumb_unmap (GtkWidget *widget)
 {