Merge lp:~azzar1/overlay-scrollbar/fix-907837 into lp:overlay-scrollbar

[Andrea Azzarone]

Add resizing to the overlay scrollbars.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:366
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/13/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/13//artifact/results/coverity/CID_13650.html
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/13//artifact/results/coverity/CID_13651.html
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/13//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/13//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/13//rebuild/?

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:366
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/16/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/16/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/16/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/16//artifact/results/coverity/CID_13650.html
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=armhf/16//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/./build=pbuilder,distribution=raring,flavor=i386/16//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/overlay-scrollbar-ci/16//rebuild/?

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM. Works, and I can't see any problems with it.

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-11-30 07:51:59 +0000
+++ os/os-scrollbar.c	2013-01-11 21:05:24 +0000
@@ -124,6 +124,8 @@
   OsWindowFilter filter;
   gboolean active_window;
   gboolean allow_resize;
+  gboolean allow_resize_paned;
+  gboolean resizing_paned;
 #ifdef USE_GTK3
   gboolean deactivable_bar;
 #endif
@@ -687,6 +689,8 @@
       priv->orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (widget));
       swap_thumb (GTK_SCROLLBAR (widget), os_thumb_new (priv->orientation));
 
+      priv->resizing_paned = FALSE;
+
       /* Connect to adjustment and orientation signals. */
       g_signal_connect (G_OBJECT (widget), "notify::adjustment",
                         G_CALLBACK (notify_adjustment_cb), NULL);
@@ -2163,12 +2167,57 @@
                 }
               /* We're in the 'no action taken' area.
                * Skip this event. */
-              return FALSE;
+              if (!priv->allow_resize_paned)
+                return FALSE;
             }
 
           /* We're in the 'SCROLLING' area.
            * Continue processing the event. */
         }
+        
+        if (priv->allow_resize_paned &&
+            !(priv->event & OS_EVENT_MOTION_NOTIFY))
+        {
+          if (((priv->side == OS_SIDE_RIGHT || priv->side == OS_SIDE_LEFT) && f_x > 0.5 * f_y) ||
+              ((priv->side == OS_SIDE_BOTTOM || priv->side == OS_SIDE_TOP) && f_y > 0.5 * f_x))
+            {
+              /* We're either in the 'RESIZE' or in the 'no action taken' area. */
+              if (((priv->side == OS_SIDE_RIGHT || priv->side == OS_SIDE_LEFT) && f_x > TOLERANCE_DRAG) ||
+                  ((priv->side == OS_SIDE_BOTTOM || priv->side == OS_SIDE_TOP) && f_y > TOLERANCE_DRAG))
+                {
+                  /* We're in the 'RESIZE' area. */
+                  GtkPaned *paned = GTK_PANED (gtk_widget_get_ancestor (GTK_WIDGET (scrollbar), GTK_TYPE_PANED));
+                 
+                  if (!paned)
+                    return FALSE;
+
+                  GdkWindow *handle_window = gtk_paned_get_handle_window (paned);
+
+                  GdkEventButton *fwd_event = (GdkEventButton*) gdk_event_new (GDK_BUTTON_PRESS);
+
+                  fwd_event->window = handle_window;
+                  fwd_event->time =  event->time;
+                  fwd_event->x = 1;
+                  fwd_event->y = 1;
+                  fwd_event->state = event->state;
+                  fwd_event->button = 1;
+                  fwd_event->x_root = event->x_root;
+                  fwd_event->y_root = event->y_root;
+                  fwd_event->device = event->device;
+
+                  gdk_event_put ((GdkEvent*) fwd_event);
+
+                  priv->resizing_paned = TRUE;
+
+                  gtk_widget_hide (widget);
+                }
+
+              /* We're in the 'no action taken' area.
+               * Skip this event. */
+              return FALSE;
+            }
+
+        }
 
       if (!(priv->event & OS_EVENT_MOTION_NOTIFY))
         {
@@ -3026,7 +3075,7 @@
                 if (priv->state & OS_STATE_LOCKED)
                   return GDK_FILTER_CONTINUE;
 
-                if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid))
+                if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid) && !priv->resizing_paned)
                   show_thumb (scrollbar);
               }
           }
@@ -3103,7 +3152,7 @@
                 if (priv->state & OS_STATE_LOCKED)
                   return GDK_FILTER_CONTINUE;
 
-                if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid))
+                if (!is_touch_mode (GTK_WIDGET (scrollbar), sourceid) && !priv->resizing_paned)
                   show_thumb (scrollbar);
               }
             else
@@ -3579,6 +3628,41 @@
     default:
       break;
   }
+
+  GtkPaned *paned = GTK_PANED (gtk_widget_get_ancestor (GTK_WIDGET (scrollbar), GTK_TYPE_PANED));
+  if (!paned)
+    return;
+
+  GdkWindow *handle_window = gtk_paned_get_handle_window (paned);
+
+  gdk_window_get_origin (handle_window, &x, &y);
+
+  priv->allow_resize_paned = FALSE;
+  priv->resizing_paned = FALSE;
+  
+  /* Check if the thumb is next to a paned handle,
+   * if that's the case, set the allow_resize_paned gboolean. */
+  switch (priv->side)
+  {
+    case OS_SIDE_RIGHT:
+      if (x + gdk_window_get_width (handle_window) - x_pos <= THUMB_WIDTH)
+        priv->allow_resize_paned = TRUE;
+      break;
+    case OS_SIDE_BOTTOM:
+      if (y + gdk_window_get_height (handle_window) - y_pos <= THUMB_WIDTH)
+        priv->allow_resize_paned = TRUE;
+      break;
+    case OS_SIDE_LEFT:
+      if (x_pos - x <= THUMB_WIDTH)
+        priv->allow_resize_paned = TRUE;
+      break;
+    case OS_SIDE_TOP:
+      if (y_pos - y <= THUMB_WIDTH)
+        priv->allow_resize_paned = TRUE;
+      break;
+    default:
+      break;
+  }
 }
 
 static void