Merge lp:~tintou/slingshot/dnd-grab into lp:~elementary-pantheon/slingshot/trunk

[Corentin Noël]

Resubmit

[Cody Garver (codygarver)]

When I drag an icon to the dock, the Slingshot window refuses to close when I click outside of it. Only leaves when I click Applications on panel.

This does not happen with r501

review: Needs Fixing

Unmerged revisions

502. By Corentin Noël on 2015-02-02

Re-establish the device grab with the right device.

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2015-02-01 22:32:07 +0000
+++ src/Widgets/AppEntry.vala	2015-02-02 00:14:10 +0000
@@ -92,15 +92,17 @@
             return false;
         });
 
-        this.drag_begin.connect ( (ctx) => {
+        this.drag_begin.connect ((ctx) => {
             this.dragging = true;
             Gtk.drag_set_icon_pixbuf (ctx, icon, 0, 0);
         });
 
-        this.drag_end.connect ( () => {
+        this.drag_end.connect ((ctx) => {
             this.dragging = false;
-            var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
-            ((SlingshotView)slingshot_app.active_window).grab_device ();
+            ctx.get_device ().grab (get_window (), Gdk.GrabOwnership.NONE, true,
+                                   Gdk.EventMask.SMOOTH_SCROLL_MASK | Gdk.EventMask.BUTTON_PRESS_MASK |
+                                   Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.POINTER_MOTION_MASK,
+                                   null, Gdk.CURRENT_TIME);
         });
 
         this.drag_data_get.connect ( (ctx, sel, info, time) => {