Merge lp:~brandontschaefer/overlay-scrollbar/lp.907837-v-resize-fix into lp:overlay-scrollbar

[Brandon Schaefer]

HPaned boxes must only be able to be resized by a vertical scroll bar and a VPaned box must only be able to be resized by a horizontal scroll bar.

=== Problem ===

When grabbing an overlay thumb that goes LEFT-RIGHT, resizing must only work on GtkVPaned boxes, otherwise it will attempt to resize an HPaned box.. which is bad.

[lp:~brandontschaefer/overlay-scrollbar/lp.907837-v-resize-fix]

368. By Brandon Schaefer on 2013-02-01

* Extra new line

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2013-02-01 23:53:21 +0000
+++ os/os-scrollbar.c	2013-02-01 23:53:21 +0000
@@ -3639,29 +3639,40 @@
 
   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;
+  if (GTK_IS_HPANED(paned))
+  {
+    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_LEFT:
+        if (x_pos - x <= THUMB_WIDTH)
+          priv->allow_resize_paned = TRUE;
+        break;
+      default:
+        break;
+    }
+  }
+  else if (GTK_IS_VPANED(paned))
+  {
+    switch (priv->side)
+    {
+      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_TOP:
+        if (y_pos - y <= THUMB_WIDTH)
+          priv->allow_resize_paned = TRUE;
+        break;
+      default:
+        break;
+    }
   }
 }