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

Proposed by Corentin Noël on 2015-02-02
Status: Rejected
Rejected by: Cody Garver on 2015-05-29
Proposed branch: lp:~tintou/slingshot/dnd-grab
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 25 lines (+6/-4)
1 file modified
src/Widgets/AppEntry.vala (+6/-4)
To merge this branch: bzr merge lp:~tintou/slingshot/dnd-grab
Reviewer Review Type Date Requested Status
Cody Garver 2015-02-02 Needs Fixing on 2015-02-03
Review via email: mp+248209@code.launchpad.net

Description of the change

Resubmit

To post a comment you must log in.
Cody Garver (codygarver) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/AppEntry.vala'
2--- src/Widgets/AppEntry.vala 2015-02-01 22:32:07 +0000
3+++ src/Widgets/AppEntry.vala 2015-02-02 00:14:10 +0000
4@@ -92,15 +92,17 @@
5 return false;
6 });
7
8- this.drag_begin.connect ( (ctx) => {
9+ this.drag_begin.connect ((ctx) => {
10 this.dragging = true;
11 Gtk.drag_set_icon_pixbuf (ctx, icon, 0, 0);
12 });
13
14- this.drag_end.connect ( () => {
15+ this.drag_end.connect ((ctx) => {
16 this.dragging = false;
17- var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
18- ((SlingshotView)slingshot_app.active_window).grab_device ();
19+ ctx.get_device ().grab (get_window (), Gdk.GrabOwnership.NONE, true,
20+ Gdk.EventMask.SMOOTH_SCROLL_MASK | Gdk.EventMask.BUTTON_PRESS_MASK |
21+ Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.POINTER_MOTION_MASK,
22+ null, Gdk.CURRENT_TIME);
23 });
24
25 this.drag_data_get.connect ( (ctx, sel, info, time) => {

Subscribers

People subscribed via source and target branches