From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 31 Jul 2013 05:17:33 +0000 (-0700)
Subject: gtkxpaned: Fix bug introduced in earlier commit.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a05980bb56d3e7db228133b807e553bc70f8a29;p=pspp

gtkxpaned: Fix bug introduced in earlier commit.

Commit 7bf0c4d57ce (gtkxpaned: Avoid deprecated gtk_widget_get_pointer().)
essentially replaced gtk_widget_get_pointer() by its implementation in
GTK+3, but it left out a part of the implementation that I didn't think
was needed.  Without that part, though, dragging most of the handles fails
to properly track the mouse pointer.  This commit fixes the problem.
---

diff --git a/lib/gtk-contrib/gtkxpaned.c b/lib/gtk-contrib/gtkxpaned.c
index 8bd5253dea..c499eb3a82 100644
--- a/lib/gtk-contrib/gtkxpaned.c
+++ b/lib/gtk-contrib/gtkxpaned.c
@@ -1480,6 +1480,11 @@ update_drag (GtkXPaned * xpaned)
                                     gdk_display_get_device_manager (
                                       gtk_widget_get_display (widget))),
                                   &pos.x, &pos.y, NULL);
+  if (!gtk_widget_get_has_window (widget))
+    {
+      pos.x -= allocation.x;
+      pos.y -= allocation.y;
+    }
 
   if (xpaned->in_drag_vert)
     {