Merge lp:~azzar1/overlay-scrollbar/deprecated-api into lp:overlay-scrollbar

[Andrea Azzarone]

[Andrea Cimitan (cimi)]

Well done Andrea! many thanks, looks good

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-05-18 18:35:34 +0000
+++ os/os-scrollbar.c	2011-05-19 14:54:29 +0000
@@ -134,9 +134,10 @@
        * total_adjustment_range) times the trough height in pixels
        */
 
-      if (priv->adjustment->upper - priv->adjustment->lower != 0)
-        height = ((bottom - top) * (priv->adjustment->page_size /
-                                 (priv->adjustment->upper - priv->adjustment->lower)));
+      if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) != 0)
+        height = ((bottom - top) * (gtk_adjustment_get_page_size (priv->adjustment) /
+                                 (gtk_adjustment_get_upper (priv->adjustment) - 
+                                  gtk_adjustment_get_lower (priv->adjustment))));
       else
         height = gtk_range_get_min_slider_size (GTK_RANGE (scrollbar));
 
@@ -146,9 +147,12 @@
 
       y = top;
 
-      if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
-        y += (bottom - top - height) * ((adjustment_value - priv->adjustment->lower) /
-                                        (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
+      if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) - 
+          gtk_adjustment_get_page_size (priv->adjustment) != 0)
+        y += (bottom - top - height) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
+                                        (gtk_adjustment_get_upper (priv->adjustment) - 
+                                         gtk_adjustment_get_lower (priv->adjustment) -
+                                         gtk_adjustment_get_page_size (priv->adjustment)));
 
       y = CLAMP (y, top, bottom);
 
@@ -166,9 +170,10 @@
        * total_adjustment_range) times the trough width in pixels
        */
 
-      if (priv->adjustment->upper - priv->adjustment->lower != 0)
-        width = ((right - left) * (priv->adjustment->page_size /
-                                  (priv->adjustment->upper - priv->adjustment->lower)));
+      if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) != 0)
+        width = ((right - left) * (gtk_adjustment_get_page_size (priv->adjustment) /
+                                  (gtk_adjustment_get_upper (priv->adjustment) - 
+                                   gtk_adjustment_get_lower (priv->adjustment))));
       else
         width =  gtk_range_get_min_slider_size (GTK_RANGE (scrollbar));
 
@@ -178,9 +183,12 @@
 
       x = left;
 
-      if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
-        x += (right - left - width) * ((adjustment_value - priv->adjustment->lower) /
-                                       (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
+      if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) - 
+          gtk_adjustment_get_page_size (priv->adjustment) != 0)
+        x += (right - left - width) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
+                                       (gtk_adjustment_get_upper (priv->adjustment) - 
+                                        gtk_adjustment_get_lower (priv->adjustment) - 
+                                        gtk_adjustment_get_page_size (priv->adjustment)));
 
       x = CLAMP (x, left, right);
 
@@ -211,9 +219,12 @@
 
       y = top;
 
-      if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
-        y += (bottom - top - height) * ((adjustment_value - priv->adjustment->lower) /
-                                        (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
+      if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) - 
+          gtk_adjustment_get_page_size (priv->adjustment) != 0)
+        y += (bottom - top - height) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
+                                        (gtk_adjustment_get_upper (priv->adjustment) - 
+                                         gtk_adjustment_get_lower (priv->adjustment) -
+                                         gtk_adjustment_get_page_size (priv->adjustment)));
 
       y = CLAMP (y, top, bottom);
 
@@ -233,9 +244,12 @@
 
       x = left;
 
-      if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
-        x += (right - left - width) * ((adjustment_value - priv->adjustment->lower) /
-                                       (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
+      if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) -
+          gtk_adjustment_get_page_size (priv->adjustment) != 0)
+        x += (right - left - width) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
+                                       (gtk_adjustment_get_upper (priv->adjustment) - 
+                                        gtk_adjustment_get_lower (priv->adjustment) - 
+                                        gtk_adjustment_get_page_size (priv->adjustment)));
 
       x = CLAMP (x, left, right);
 
@@ -571,7 +585,8 @@
    * hidden a pager that is meant to be hidden/shown.
    * I don't want to see pagers reappearing because
    * of a change in the adjustment of an invisible pager or viceversa. */
-  if ((adjustment->upper - adjustment->lower) > adjustment->page_size)
+  if ((gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) > 
+      gtk_adjustment_get_page_size (adjustment))
     {
       priv->fullsize = FALSE;
       if (priv->proximity != FALSE)
@@ -588,8 +603,8 @@
         }
     }
 
-  calc_layout_pager (scrollbar, adjustment->value);
-  calc_layout_slider (scrollbar, adjustment->value);
+  calc_layout_pager (scrollbar, gtk_adjustment_get_value (adjustment));
+  calc_layout_slider (scrollbar, gtk_adjustment_get_value (adjustment));
 
   if (!priv->motion_notify_event && !priv->enter_notify_event)
     gtk_widget_hide (GTK_WIDGET (priv->thumb));
@@ -607,8 +622,8 @@
   scrollbar = OS_SCROLLBAR (user_data);
   priv = scrollbar->priv;
 
-  calc_layout_pager (scrollbar, adjustment->value);
-  calc_layout_slider (scrollbar, adjustment->value);
+  calc_layout_pager (scrollbar, gtk_adjustment_get_value (adjustment));
+  calc_layout_slider (scrollbar, gtk_adjustment_get_value (adjustment));
 
   if (!priv->motion_notify_event && !priv->enter_notify_event)
     gtk_widget_hide (GTK_WIDGET (priv->thumb));
@@ -1134,11 +1149,12 @@
     frac = (MAX (0, coord - trough_start) /
             (gdouble) (trough_length - slider_length));
 
-  value = priv->adjustment->lower + frac * (priv->adjustment->upper -
-                                            priv->adjustment->lower -
-                                            priv->adjustment->page_size);
+  value = gtk_adjustment_get_lower (priv->adjustment) + frac * (gtk_adjustment_get_upper (priv->adjustment) -
+                                            gtk_adjustment_get_lower (priv->adjustment) -
+                                            gtk_adjustment_get_page_size (priv->adjustment));
 
-  value = CLAMP (value, priv->adjustment->lower, priv->adjustment->upper - priv->adjustment->page_size);
+  value = CLAMP (value, gtk_adjustment_get_lower (priv->adjustment), 
+                 gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment));
 
   return value;
 }
@@ -1215,7 +1231,7 @@
                          priv->win_y + priv->overlay.y,
                          priv->win_y + priv->overlay.y + priv->overlay.height - priv->slider.height);
 
-              if (priv->adjustment->value == 0)
+              if (gtk_adjustment_get_value (priv->adjustment) == 0)
                 {
                   priv->slide_initial_slider_position = 0;
                   priv->slide_initial_coordinate = MAX (event->y_root, priv->win_y + priv->pointer_y);
@@ -1241,7 +1257,7 @@
                          priv->win_x + priv->overlay.x + priv->overlay.width - priv->slider.width);
               y = priv->win_y;
 
-              if (priv->adjustment->value == 0)
+              if (gtk_adjustment_get_value (priv->adjustment) == 0)
                 {
                   priv->slide_initial_slider_position = 0;
                   priv->slide_initial_coordinate = MAX (event->x_root, priv->win_x + priv->pointer_x);
@@ -1275,7 +1291,7 @@
 
   priv = scrollbar->priv;
 
-  delta = pow (priv->adjustment->page_size, 2.0 / 3.0);
+  delta = pow (gtk_adjustment_get_page_size (priv->adjustment), 2.0 / 3.0);
 
   if (direction == GDK_SCROLL_UP ||
       direction == GDK_SCROLL_LEFT)
@@ -1301,10 +1317,10 @@
   delta = get_wheel_delta (scrollbar, event->direction);
 
   gtk_adjustment_set_value (priv->adjustment,
-                            CLAMP (priv->adjustment->value + delta,
-                                   priv->adjustment->lower,
-                                   (priv->adjustment->upper -
-                                    priv->adjustment->page_size)));
+                            CLAMP (gtk_adjustment_get_value (priv->adjustment) + delta,
+                                   gtk_adjustment_get_lower (priv->adjustment),
+                                   (gtk_adjustment_get_upper (priv->adjustment) -
+                                    gtk_adjustment_get_page_size (priv->adjustment))));
 
   return FALSE;
 }
@@ -1410,8 +1426,8 @@
 
   priv->lock_position = FALSE;
 
-  calc_layout_pager (scrollbar, priv->adjustment->value);
-  calc_layout_slider (scrollbar, priv->adjustment->value);
+  calc_layout_pager (scrollbar, gtk_adjustment_get_value (priv->adjustment));
+  calc_layout_slider (scrollbar, gtk_adjustment_get_value (priv->adjustment));
 
   store_toplevel_position (scrollbar);
 
@@ -1900,7 +1916,7 @@
   g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (widget)), "configure-event",
                     G_CALLBACK (toplevel_configure_event_cb), scrollbar);
 
-  calc_layout_pager (scrollbar, priv->adjustment->value);
+  calc_layout_pager (scrollbar, gtk_adjustment_get_value (priv->adjustment));
 
   os_pager_set_parent (OS_PAGER (priv->pager), widget);
 
@@ -1963,8 +1979,8 @@
 
   if (priv->adjustment != NULL)
     {
-      calc_layout_pager (scrollbar, priv->adjustment->value);
-      calc_layout_slider (scrollbar, priv->adjustment->value);
+      calc_layout_pager (scrollbar, gtk_adjustment_get_value (priv->adjustment));
+      calc_layout_slider (scrollbar, gtk_adjustment_get_value (priv->adjustment));
     }
 
   os_pager_size_allocate (OS_PAGER (priv->pager), rect);
@@ -1974,7 +1990,7 @@
   if (gtk_widget_get_realized (widget))
     store_toplevel_position (scrollbar);
 
-  widget->allocation = *allocation;
+  gtk_widget_set_allocation (widget, allocation);
 }
 
 static void
 
=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-05-18 18:25:13 +0000
+++ os/os-thumb.c	2011-05-19 14:54:29 +0000
@@ -273,12 +273,19 @@
   if (gdk_screen_is_composited (gtk_widget_get_screen (widget)))
     {
       GdkVisual *visual;
+      guint32 red_mask;
+      guint32 green_mask;
+      guint32 blue_mask;
 
       visual = gtk_widget_get_visual (widget);
 
-      if (visual->depth == 32 && (visual->red_mask   == 0xff0000 &&
-                                  visual->green_mask == 0x00ff00 &&
-                                  visual->blue_mask  == 0x0000ff))
+      gdk_visual_get_red_pixel_details (visual, &red_mask, NULL, NULL);
+      gdk_visual_get_green_pixel_details (visual, &green_mask, NULL, NULL);
+      gdk_visual_get_blue_pixel_details (visual, &blue_mask, NULL, NULL);
+
+      if (gdk_visual_get_depth (visual) == 32 && (red_mask   == 0xff0000 &&
+                                                  green_mask == 0x00ff00 &&
+                                                  blue_mask  == 0x0000ff))   
         priv->can_rgba = TRUE;
     }
 
 
=== modified file 'os/os-utils.h'
--- os/os-utils.h	2011-03-23 15:42:09 +0000
+++ os/os-utils.h	2011-05-19 14:54:29 +0000
@@ -28,8 +28,7 @@
 #define __OS_UTILS_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS