Merge lp:~wingpanel-devs/slingshot/close_on_drag into lp:~elementary-pantheon/slingshot/trunk

Proposed by Djax
Status: Merged
Approved by: Felipe Escoto
Approved revision: 669
Merged at revision: 670
Proposed branch: lp:~wingpanel-devs/slingshot/close_on_drag
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 23 lines (+2/-0)
2 files modified
src/Widgets/AppEntry.vala (+1/-0)
src/Widgets/SearchView.vala (+1/-0)
To merge this branch: bzr merge lp:~wingpanel-devs/slingshot/close_on_drag
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+299235@code.launchpad.net

Commit message

close slingshot on DnD

Description of the change

close slingshot when a drag occurs to offer drag targets

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala 2016-07-02 16:06:02 +0000
+++ src/Widgets/AppEntry.vala 2016-07-05 20:26:54 +0000
@@ -137,6 +137,7 @@
137 this.drag_begin.connect ((ctx) => {137 this.drag_begin.connect ((ctx) => {
138 this.dragging = true;138 this.dragging = true;
139 Gtk.drag_set_icon_gicon (ctx, this.image.gicon, 16, 16);139 Gtk.drag_set_icon_gicon (ctx, this.image.gicon, 16, 16);
140 app_launched ();
140 });141 });
141142
142 this.drag_end.connect ( () => {143 this.drag_end.connect ( () => {
143144
=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala 2016-07-02 16:06:02 +0000
+++ src/Widgets/SearchView.vala 2016-07-05 20:26:54 +0000
@@ -82,6 +82,7 @@
82 if (drag_uri != null) {82 if (drag_uri != null) {
83 dragging = true;83 dragging = true;
84 Gtk.drag_set_icon_gicon (ctx, di.icon.gicon, 16, 16);84 Gtk.drag_set_icon_gicon (ctx, di.icon.gicon, 16, 16);
85 app_launched ();
85 }86 }
86 }87 }
87 });88 });

Subscribers

People subscribed via source and target branches