Merge lp:~cimi/overlay-scrollbar/fix.868739-take_1bis into lp:overlay-scrollbar

[Andrea Cimitan]

Enhanced approach to https://code.launchpad.net/~cimi/ayatana-scrollbar/fix.868739-take_1
Stores the values only when showing the thumb for the first time. (Might fail if someone scrolls a scrolled window which contains the scrollbar while you're in the proximity area and you mapped the thumb)

[Ted Gould (ted)]

review: Approve

[Andrea Cimitan (cimi)]

I disapprove this and will take the original lp:~cimi/ayatana-scrollbar/fix.868739-take_1
Why? Because I think it's faster to simply write the variables to memory rather than calling the external function (which will do multiple checks on the widget then for its mapped state) AND evaluating the value. Also, should be safer on the weird case mentioned

review: Disapprove

Unmerged revisions

313. By Andrea Cimitan on 2011-10-20

Fix 868739

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-10-12 17:12:29 +0000
+++ os/os-scrollbar.c	2011-10-20 11:14:34 +0000
@@ -291,23 +291,6 @@
     }
 }
 
-/* Calculate the position of the thumb window. */
-static void
-calc_thumb_window_position (OsScrollbar *scrollbar)
-{
-  OsScrollbarPrivate *priv;
-  gint x_pos, y_pos;
-
-  priv = scrollbar->priv;
-
-  /* In reality, I'm storing widget's window, not the toplevel.
-   * Is that the same with gdk_window_get_origin? */
-  gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (scrollbar)), &x_pos, &y_pos);
-
-  priv->thumb_win.x = x_pos + priv->thumb_all.x;
-  priv->thumb_win.y = y_pos + priv->thumb_all.y;
-}
-
 /* Calculate the workarea using _UNITY_NET_WORKAREA_REGION. */
 static void
 calc_workarea (Display *display,
@@ -2159,8 +2142,6 @@
   calc_layout_bar (scrollbar, gtk_adjustment_get_value (priv->adjustment));
   calc_layout_slider (scrollbar, gtk_adjustment_get_value (priv->adjustment));
 
-  calc_thumb_window_position (scrollbar);
-
   return FALSE;
 }
 
@@ -2179,6 +2160,18 @@
 
   gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (scrollbar)), &x_pos, &y_pos);
 
+  if (!gtk_widget_get_mapped (priv->thumb))
+    {
+      /* Calculate priv->thumb_win.x and priv->thumb_win.y
+       * (thumb window allocation in root coordinates).
+       * I guess it's faster to store these values,
+       * instead calling everytime gdk_window_get_origin (),
+       * because it requires less calls than Gdk, which, in fact,
+       * loops through multiple functions to return them. */
+      priv->thumb_win.x = x_pos + priv->thumb_all.x;
+      priv->thumb_win.y = y_pos + priv->thumb_all.y;
+    }
+
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
       x = priv->thumb_all.x;
@@ -3058,8 +3051,6 @@
   calc_layout_bar (scrollbar, gtk_adjustment_get_value (priv->adjustment));
 
   os_bar_set_parent (priv->bar, widget);
-
-  calc_thumb_window_position (scrollbar);
 }
 
 static void
@@ -3190,9 +3181,6 @@
 
   move_bar (scrollbar);
 
-  if (gtk_widget_get_realized (widget))
-    calc_thumb_window_position (scrollbar);
-
   gtk_widget_set_allocation (widget, allocation);
 }