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

[Andrea Cimitan]

I was storing the position of the window on size_allocate, but on size_allocate the widget could be not realized yet, so its gdk_window not on screen, and so os_scrollbar_store_window_position was storing random values.
Now, everything is done in the realize, so we're sure to get the right position

[Ted Gould (ted)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-09 16:16:12 +0000
+++ os/os-scrollbar.c	2011-03-10 17:23:11 +0000
@@ -496,8 +496,7 @@
 
   priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
 
-  if (GDK_IS_WINDOW (gtk_widget_get_window (priv->parent)))
-    gdk_window_get_position (gtk_widget_get_window (priv->parent), &win_x, &win_y);
+  gdk_window_get_position (gtk_widget_get_window (priv->parent), &win_x, &win_y);
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
@@ -985,6 +984,8 @@
   os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
 
   os_pager_set_parent (OS_PAGER (priv->pager), priv->parent);
+
+  os_scrollbar_store_window_position (scrollbar);
 }
 
 static void
@@ -1025,8 +1026,6 @@
     os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
 
   pager_set_allocation (scrollbar);
-
-  os_scrollbar_store_window_position (scrollbar);
 }
 
 static void
@@ -1110,7 +1109,6 @@
           os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
           os_scrollbar_calc_layout_slider (scrollbar, priv->adjustment->value);
 
-          /* XXX missing horizontal */
           /* proximity area */
           if (priv->orientation == GTK_ORIENTATION_VERTICAL)
             {