Merge lp:~cimi/overlay-scrollbar/fix-838733 into lp:overlay-scrollbar

[Andrea Cimitan]

[Ted Gould (ted)]

review: Approve

[lp:~cimi/overlay-scrollbar/fix-838733]

305. By Andrea Cimitan on 2011-09-01

Dots

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-08-24 18:34:08 +0000
+++ os/os-scrollbar.c	2011-09-01 18:52:40 +0000
@@ -42,8 +42,11 @@
 /* Rate of the paging. */
 #define RATE_PAGING 30
 
-/* Duration of the paging. */
-#define DURATION_PAGING 1000
+/* Max duration of the paging. */
+#define MAX_DURATION_PAGING 1000
+
+/* Min duration of the paging. */
+#define MIN_DURATION_PAGING 250
 
 /* Timeout assumed for PropertyNotify _NET_ACTIVE_WINDOW event. */
 #define TIMEOUT_PRESENT_WINDOW 400
@@ -1295,6 +1298,7 @@
 {
   OsScrollbarPrivate *priv;
   gdouble new_value;
+  gint32 duration;
 
   priv = scrollbar->priv;
 
@@ -1313,6 +1317,12 @@
                        gtk_adjustment_get_lower (priv->adjustment),
                        gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment));
 
+  /* calculate and set the duration. */
+  duration = MIN_DURATION_PAGING + ((priv->value - gtk_adjustment_get_value (priv->adjustment)) /
+                                    gtk_adjustment_get_page_increment (priv->adjustment)) *
+                                   (MAX_DURATION_PAGING - MIN_DURATION_PAGING);
+  os_animation_set_duration (priv->animation, duration);
+
   /* start the paging animation. */
   os_animation_start (priv->animation);
 }
@@ -1323,6 +1333,7 @@
 {
   OsScrollbarPrivate *priv;
   gdouble new_value;
+  gint32 duration;
 
   priv = scrollbar->priv;
 
@@ -1341,6 +1352,12 @@
                        gtk_adjustment_get_lower (priv->adjustment),
                        gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment));
 
+  /* calculate and set the duration. */
+  duration = MIN_DURATION_PAGING + ((gtk_adjustment_get_value (priv->adjustment) - priv->value) /
+                                    gtk_adjustment_get_page_increment (priv->adjustment)) *
+                                   (MAX_DURATION_PAGING - MIN_DURATION_PAGING);
+  os_animation_set_duration (priv->animation, duration);
+
   /* start the paging animation. */
   os_animation_start (priv->animation);
 }
@@ -2639,7 +2656,7 @@
 
   priv->window_group = gtk_window_group_new ();
 
-  priv->animation = os_animation_new (RATE_PAGING, DURATION_PAGING,
+  priv->animation = os_animation_new (RATE_PAGING, MAX_DURATION_PAGING,
                                       paging_cb, NULL, scrollbar);
   priv->value = 0;