Merge lp:~cimi/overlay-scrollbar/fix-motion-after-reconnection into lp:overlay-scrollbar

[Andrea Cimitan]

Fixes motion notify event after reconnection animation ended. Plus add some comments.

[lp:~cimi/overlay-scrollbar/fix-motion-after-reconnection]

318. By Andrea Cimitan on 2011-12-05

Updated to trunk

Unmerged revisions

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-12-02 17:04:13 +0000
+++ os/os-scrollbar.c	2011-12-05 16:27:25 +0000
@@ -71,14 +71,15 @@
 
 typedef enum
 {
-  OS_SIDE_TOP,
-  OS_SIDE_BOTTOM,
-  OS_SIDE_LEFT,
-  OS_SIDE_RIGHT
+  OS_SIDE_TOP, /* Scrollbar is at top. */
+  OS_SIDE_BOTTOM, /* Scrollbar is at bottom. */
+  OS_SIDE_LEFT, /* Scrollbar is at left. */
+  OS_SIDE_RIGHT /* Scrollbar is at right. */
 } OsSide;
 
 typedef enum
 {
+<<<<<<< TREE
   OS_STATE_NONE = 0,
   OS_STATE_CONNECTED = 1,
   OS_STATE_DETACHED = 2,
@@ -87,15 +88,24 @@
   OS_STATE_INTERNAL = 16,
   OS_STATE_LOCKED = 32,
   OS_STATE_RECONNECTING = 64
+=======
+  OS_STATE_NONE = 0, /* No state. */
+  OS_STATE_CONNECTED = 1, /* Thumb and bar move connected, like a native scrollbar. */
+  OS_STATE_DETACHED = 2, /* The thumb is visually detached from the bar, and you can see the tail. */
+  OS_STATE_FULLSIZE = 4, /* The scrollbar is fullsize, so we hide it. */
+  OS_STATE_INTERNAL = 8, /* The thumb is touching a strut or a screen edge, it's internal. */
+  OS_STATE_LOCKED = 16, /* Thumb is locked in its position when moving in the proximity area. */
+  OS_STATE_RECONNECTING = 32 /* The thumb is reconnecting with the bar, there's likely an animation in progress. */
+>>>>>>> MERGE-SOURCE
 } OsStateFlags;
 
 typedef enum
 {
-  OS_STRUT_SIDE_NONE = 0,
-  OS_STRUT_SIDE_TOP = 1,
-  OS_STRUT_SIDE_BOTTOM = 2,
-  OS_STRUT_SIDE_LEFT = 4,
-  OS_STRUT_SIDE_RIGHT = 8
+  OS_STRUT_SIDE_NONE = 0, /* No strut. */
+  OS_STRUT_SIDE_TOP = 1, /* Strut at top. */
+  OS_STRUT_SIDE_BOTTOM = 2, /* Strut at bottom. */
+  OS_STRUT_SIDE_LEFT = 4, /* Strut at left. */
+  OS_STRUT_SIDE_RIGHT = 8 /* Strut at right. */
 } OsStrutSideFlags;
 
 typedef struct
@@ -996,10 +1006,55 @@
 
   priv = scrollbar->priv;
 
-  priv->state &= ~(OS_STATE_RECONNECTING);
-
-  check_connection (scrollbar);
-}
+  /* Only update the slide values at the end of a reconnection,
+   * with the button pressed, otherwise it's not needed. */
+  if ((priv->state & OS_STATE_RECONNECTING) &&
+      (priv->event & OS_EVENT_BUTTON_PRESS))
+    {
+      gint x_pos, y_pos;
+
+      gdk_window_get_origin (gtk_widget_get_window (priv->thumb), &x_pos, &y_pos);
+
+      if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+        {
+          priv->slide_initial_slider_position = MIN (priv->slider.y, priv->overlay.y);
+          priv->slide_initial_coordinate = y_pos + priv->pointer.y;
+        }
+      else
+        {
+          priv->slide_initial_slider_position = MIN (priv->slider.x, priv->overlay.x);
+          priv->slide_initial_coordinate = x_pos + priv->pointer.x;
+        }
+    }
+
+  /* Check if the thumb can be considered connected after the animation. */
+  check_connection (scrollbar);
+
+  /* Unset OS_STATE_RECONNECTING since the animation ended. */
+  priv->state &= ~(OS_STATE_RECONNECTING);
+}
+
+/* Stop function called by the scrolling animation. */
+static void
+scrolling_stop_cb (gpointer user_data)
+{
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+
+  priv = scrollbar->priv;
+
+  /* No slide values update here,
+   * handle them separately! */
+
+  /* Check if the thumb can be considered connected after the animation. */
+  check_connection (scrollbar);
+
+  /* Unset OS_STATE_RECONNECTING since the animation ended. */
+  priv->state &= ~(OS_STATE_RECONNECTING);
+}
+
 
 /* Swap adjustment pointer. */
 static void
@@ -1521,29 +1576,17 @@
             {
               /* Reconnect the thumb with the bar. */
               gdouble new_value;
-              gint c, delta;
+              gint c;
               gint32 duration;
 
               if (priv->orientation == GTK_ORIENTATION_VERTICAL)
-                {
-                  priv->slide_initial_slider_position = event->y_root - priv->thumb_win.y - event->y;
-                  priv->slide_initial_coordinate = event->y_root;
-
-                  delta = event->y_root - priv->slide_initial_coordinate;
-                }
+                c = event->y_root - priv->thumb_win.y - event->y;
               else
-                {
-                  priv->slide_initial_slider_position = event->x_root - priv->thumb_win.x - event->x;
-                  priv->slide_initial_coordinate = event->x_root;
-
-                  delta = event->x_root - priv->slide_initial_coordinate;
-                }
-
-              c = priv->slide_initial_slider_position + delta;
+                c = event->x_root - priv->thumb_win.x - event->x;
 
               /* If a scrolling animation is running,
                * stop it and add the new value. */
-              os_animation_stop (priv->animation, NULL);
+              os_animation_stop (priv->animation, scrolling_stop_cb);
 
               new_value = coord_to_value (scrollbar, c);
 
@@ -1603,8 +1646,13 @@
    * stop it and add the new value. */
   if (os_animation_is_running (priv->animation))
     {
+<<<<<<< TREE
       os_animation_stop (priv->animation, NULL);
       new_value = priv->value + increment;
+=======
+      os_animation_stop (priv->animation, scrolling_stop_cb);
+      new_value = priv->value + gtk_adjustment_get_page_increment (priv->adjustment);
+>>>>>>> MERGE-SOURCE
     }
   else
       new_value = gtk_adjustment_get_value (priv->adjustment) + increment;
@@ -1650,8 +1698,13 @@
    * stop it and subtract the new value. */
   if (os_animation_is_running (priv->animation))
     {
+<<<<<<< TREE
       os_animation_stop (priv->animation, NULL);
       new_value = priv->value - increment;
+=======
+      os_animation_stop (priv->animation, scrolling_stop_cb);
+      new_value = priv->value - gtk_adjustment_get_page_increment (priv->adjustment);
+>>>>>>> MERGE-SOURCE
     }
   else
       new_value = gtk_adjustment_get_value (priv->adjustment) - increment;
@@ -1950,7 +2003,7 @@
           else
             {
               /* Stop the paging animation now. */
-              os_animation_stop (priv->animation, NULL);
+              os_animation_stop (priv->animation, scrolling_stop_cb);
             }
         }