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

[Djax]

Fix regression regarding to DnD behavior

This branch is based on
https://code.launchpad.net/~jeremywootten/slingshot/fix-1565134-cannot-drag-from-search/+merge/297448

and depends on https://code.launchpad.net/~wingpanel-devs/wingpanel/close_on_drag/+merge/298977

it fixes the DnD to plank behavior in normal mode and in search mode

[Felipe Escoto (philip.scott)]

review: Approve

=== modified file 'src/Slingshot.vala'
--- src/Slingshot.vala	2016-02-17 19:06:52 +0000
+++ src/Slingshot.vala	2016-07-02 16:12:12 +0000
@@ -17,7 +17,6 @@
 //
 
 public class Slingshot.Slingshot : Wingpanel.Indicator {
-
     private SlingshotView? view = null;
 
     private Gtk.Label? indicator_label = null;
@@ -75,7 +74,6 @@
     public override void closed () {
         // TODO: Do we need to do anyhting here?
     }
-
 }
 
 public Wingpanel.Indicator get_indicator (Module module) {

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2016-02-17 19:06:52 +0000
+++ src/SlingshotView.vala	2016-07-02 16:12:12 +0000
@@ -73,7 +73,7 @@
         private int primary_monitor = 0;
 
         Gdk.Screen screen;
-        
+
         public signal void close_indicator ();
 
         public SlingshotView () {
@@ -223,7 +223,6 @@
             } else if (event.x_root >= 1 || event.y_root >= 1) {
                 can_trigger_hotcorner = true;
             }
-
             return false;
         }
 
@@ -295,7 +294,7 @@
                     update_launcher_entry (sender_name, parameters, true);
                     return false;
                 });
-                
+
                 return;
             }
 
@@ -386,7 +385,7 @@
                 case "Return":
                 case "KP_Enter":
                     return false;
-                    
+
                 case "Alt_L":
                 case "Alt_R":
                     break;
@@ -781,6 +780,6 @@
             } else if (delta_column < 0 || delta_row < 0) {
                 search_entry.grab_focus ();
             }
-        }   
+        }
     }
 }

=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2016-02-17 19:06:52 +0000
+++ src/Widgets/AppEntry.vala	2016-07-02 16:12:12 +0000
@@ -134,9 +134,9 @@
             return false;
         });
 
-        this.drag_begin.connect ( (ctx) => {
+        this.drag_begin.connect ((ctx) => {
             this.dragging = true;
-            Gtk.drag_set_icon_gicon (ctx, app.icon, 0, 0);
+            Gtk.drag_set_icon_gicon (ctx, this.image.gicon, 16, 16);
         });
 
         this.drag_end.connect ( () => {
@@ -183,7 +183,7 @@
 
         count_image.set_from_surface (surface.Internal);
     }
-#endif     
+#endif
 
     private void create_menu () {
         // Display the apps static quicklist items in a popover menu

=== modified file 'src/Widgets/SearchItem.vala'
--- src/Widgets/SearchItem.vala	2016-04-21 18:23:20 +0000
+++ src/Widgets/SearchItem.vala	2016-07-02 16:12:12 +0000
@@ -39,10 +39,9 @@
         public Backend.App app { get; construct; }
         public ResultType result_type { public get; construct; }
 
-        public bool dragging = false; //prevent launching
-
         private Gtk.Label name_label;
-        private Gtk.Image icon;
+        public Gtk.Image icon { public get; private set; }
+        public string? app_uri { get; private set; }
         private Cancellable? cancellable = null;
 
         public SearchItem (Backend.App app, string search_term = "", ResultType result_type = ResultType.UNKNOWN) {
@@ -89,24 +88,14 @@
 
             add (grid);
 
-            if (result_type != SearchItem.ResultType.APP_ACTIONS)
+            if (result_type != SearchItem.ResultType.APP_ACTIONS) {
                 launch_app.connect (app.launch);
+            }
 
+            app_uri = null;
             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_gicon (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 ()});
-                });
+                app_uri = File.new_for_path (app_match.filename).get_uri ();
             }
         }
 

=== modified file 'src/Widgets/SearchView.vala'
--- src/Widgets/SearchView.vala	2016-05-04 02:46:59 +0000
+++ src/Widgets/SearchView.vala	2016-07-02 16:12:12 +0000
@@ -33,6 +33,9 @@
         private Gtk.ListBox list_box;
         Gee.HashMap<SearchItem.ResultType, uint> limitator;
 
+        private bool dragging = false;
+        private string? drag_uri = null;
+
         public SearchView () {
 
         }
@@ -46,15 +49,55 @@
             list_box.activate_on_single_click = true;
             list_box.set_sort_func ((row1, row2) => update_sort (row1, row2));
             list_box.set_header_func ((Gtk.ListBoxUpdateHeaderFunc) update_header);
+            list_box.set_selection_mode (Gtk.SelectionMode.BROWSE);
             list_box.row_activated.connect ((row) => {
                 var search_item = row as SearchItem;
-                if (search_item.result_type == SearchItem.ResultType.APP_ACTIONS || search_item.result_type == SearchItem.ResultType.LINK) {
-                    search_item.app.match.execute (null);
-                } else {
-                    search_item.app.launch ();
-                }
-
-                app_launched ();
+                if (!dragging) {
+                    if (search_item.result_type == SearchItem.ResultType.APP_ACTIONS || search_item.result_type == SearchItem.ResultType.LINK) {
+                        search_item.app.match.execute (null);
+                    } else {
+                        search_item.app.launch ();
+                    }
+
+                    app_launched ();
+                }
+            });
+
+            // Drag support
+            Gtk.TargetEntry dnd = {"text/uri-list", 0, 0};
+            Gtk.drag_source_set (list_box, Gdk.ModifierType.BUTTON1_MASK, {dnd}, Gdk.DragAction.COPY);
+
+            list_box.motion_notify_event.connect ((event) => {
+                if (!dragging) {
+                    list_box.select_row (list_box.get_row_at_y ((int)event.y));
+                }
+                return false;
+            });
+
+            list_box.drag_begin.connect ( (ctx) => {
+                var sr = list_box.get_selected_rows ();
+                if (sr.length () > 0) {
+                    var di = (SearchItem)(sr.first ().data);
+                    drag_uri = di.app_uri;
+                    if (drag_uri != null) {
+                        dragging = true;
+                        Gtk.drag_set_icon_gicon (ctx, di.icon.gicon, 16, 16);
+                    }
+                }
+            });
+
+            list_box.drag_end.connect ( () => {
+                if (drag_uri != null) {
+                    app_launched (); /* This causes indicator to close */
+                }
+                dragging = false;
+                drag_uri = null;
+            });
+
+            list_box.drag_data_get.connect ( (ctx, sel, info, time) => {
+                if (drag_uri != null) {
+                    sel.set_uris ({drag_uri});
+                }
             });
 
             // alert view