Merge lp:~cimi/overlay-scrollbar/scrolled-window-offset into lp:overlay-scrollbar

[Andrea Cimitan]

checks for scrolled window on parent set, eventually applies an offset

[lp:~cimi/overlay-scrollbar/scrolled-window-offset]

156. By Andrea Cimitan on 2011-03-11

check at allocation, because the shadow type may change after swap_parent

[Mikkel Kamstrup Erlandsen (kamstrup)]

12 + if (GTK_SCROLLED_WINDOW (priv->parent) &&
13 + gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (priv->parent)) != GTK_SHADOW_NONE)
14 + offset = 1;

Is guess you mean GTK_IS_SCROLLED_WINDOW() here and not just GTK_SCROLLED_WINDOW()

49 + if (GTK_SCROLLED_WINDOW (widget) &&
50 + gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (widget)) != GTK_SHADOW_NONE)
51 + offset = 1;

Ditto.

Otherwise looks good to me, so conditionally approved with ^^ fixed :-)

review: Approve

[Andrea Cimitan (cimi)]

yup typo :) that's why reviews are useful :D

[lp:~cimi/overlay-scrollbar/scrolled-window-offset]

157. By Andrea Cimitan on 2011-03-15

Fixes typo (thx kamstrup for noticing this!)

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-14 15:37:53 +0000
+++ os/os-scrollbar.c	2011-03-15 15:38:45 +0000
@@ -881,21 +881,28 @@
 {
   GdkRectangle rect;
   OsScrollbarPrivate *priv;
+  gint offset;
 
   priv = scrollbar->priv;
 
+  if (GTK_IS_SCROLLED_WINDOW (priv->parent) &&
+      gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (priv->parent)) != GTK_SHADOW_NONE)
+    offset = 1;
+  else
+    offset = 0;
+
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
       rect.x = priv->overlay_all.x;
-      rect.y = priv->overlay_all.y + 1;
+      rect.y = priv->overlay_all.y + offset;
       rect.width = DEFAULT_PAGER_WIDTH;
-      rect.height = priv->overlay_all.height - 2;
+      rect.height = priv->overlay_all.height - offset * 2;
     }
   else
     {
-      rect.x = priv->overlay_all.x + 1;
+      rect.x = priv->overlay_all.x + offset;
       rect.y = priv->overlay_all.y;
-      rect.width = priv->overlay_all.width - 2;
+      rect.width = priv->overlay_all.width - offset * 2;
       rect.height = DEFAULT_PAGER_WIDTH;
     }
 
@@ -1000,6 +1007,7 @@
 {
   OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
+  gint offset;
 
   scrollbar = OS_SCROLLBAR (user_data);
   priv = scrollbar->priv;
@@ -1012,19 +1020,25 @@
   priv->overlay_all = *allocation;
   priv->thumb_all = *allocation;
 
+  if (GTK_IS_SCROLLED_WINDOW (widget) &&
+      gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (widget)) != GTK_SHADOW_NONE)
+    offset = 1;
+  else
+    offset = 0;
+
   if (priv->orientation == GTK_ORIENTATION_VERTICAL)
     {
       priv->slider.width = DEFAULT_SCROLLBAR_WIDTH;
       priv->slider.height = DEFAULT_SCROLLBAR_HEIGHT;
-      priv->overlay_all.x = allocation->x + allocation->width - DEFAULT_PAGER_WIDTH - 1;
-      priv->thumb_all.x = allocation->x + allocation->width - 1;
+      priv->overlay_all.x = allocation->x + allocation->width - DEFAULT_PAGER_WIDTH - offset;
+      priv->thumb_all.x = allocation->x + allocation->width - offset;
     }
   else
     {
       priv->slider.width = DEFAULT_SCROLLBAR_HEIGHT;
       priv->slider.height = DEFAULT_SCROLLBAR_WIDTH;
-      priv->overlay_all.y = allocation->y + allocation->height - DEFAULT_PAGER_WIDTH - 1;
-      priv->thumb_all.y = allocation->y + allocation->height - 1;
+      priv->overlay_all.y = allocation->y + allocation->height - DEFAULT_PAGER_WIDTH - offset;
+      priv->thumb_all.y = allocation->y + allocation->height - offset;
     }
 
   if (priv->adjustment != NULL)