Merge lp:~parnold-x/slingshot/fix-1008352 into lp:~elementary-pantheon/slingshot/trunk

[Djax]

Support dragging apps in search view (lp:1008352)

Fix Bug #1008352

=== modified file 'src/Widgets/SearchItem.vala'
--- src/Widgets/SearchItem.vala	2014-06-12 09:14:57 +0000
+++ src/Widgets/SearchItem.vala	2014-08-11 08:42:29 +0000
@@ -28,12 +28,13 @@
         private Gtk.Image icon;
 
         private Cancellable? cancellable = null;
+        public bool dragging = false; //prevent launching
 
         public signal bool launch_app ();
 
         public SearchItem (Backend.App app, string search_term = "") {
             Object (app: app);
-
+            
             get_style_context ().add_class ("app");
             get_style_context ().add_class ("search-item");
 
@@ -68,6 +69,24 @@
             add (box);
 
             launch_app.connect (app.launch);
+
+            var app_match = app.match as Synapse.ApplicationMatch;
+            if (app_match != null) {
+                Gtk.TargetEntry dnd = {"text/uri-list", 0, 0};
+                Gtk.drag_source_set (this, Gdk.ModifierType.BUTTON1_MASK, {dnd},
+                Gdk.DragAction.COPY);
+                this.drag_begin.connect ( (ctx) => {
+                    this.dragging = true;
+                    Gtk.drag_set_icon_pixbuf (ctx, app.icon, 0, 0);
+                });
+                this.drag_end.connect ( () => {
+                    this.dragging = false;
+                });
+                this.drag_data_get.connect ( (ctx, sel, info, time) => {
+                    sel.set_uris ({File.new_for_path (app_match.filename).get_uri ()});
+                });
+            }
+           
         }
 
         public override void destroy () {
@@ -79,4 +98,4 @@
         }
     }
 
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2014-06-12 09:14:57 +0000
+++ src/Widgets/SearchView.vala	2014-08-11 08:42:29 +0000
@@ -216,8 +216,10 @@
             var search_item = new SearchItem (app, search_term);
             app.start_search.connect ((search, target) => start_search (search, target));
             search_item.button_release_event.connect (() => {
-                app.launch ();
-                app_launched ();
+                if (!search_item.dragging) {
+                    app.launch ();
+                    app_launched ();
+                }
                 return true;
             });
 
@@ -352,4 +354,4 @@
 
     }
 
-}
+}
\ No newline at end of file