Merge lp:~jeremywootten/pantheon-files/fix-1641682-overlay-info-for-individually-selected into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Do not cancel selection update on hover change

This branch fixes a bug in OverlayBar where the updating of "selected_files" is cancelled unnecessarily, causing the linked bug.

The opportunity is taken to fix some code formatting in functions touched and to remove a redundant, unused parameter.

=== modified file 'src/View/OverlayBar.vala'
--- src/View/OverlayBar.vala	2016-07-31 17:59:58 +0000
+++ src/View/OverlayBar.vala	2016-11-27 19:11:42 +0000
@@ -33,13 +33,14 @@
         private GLib.FileInputStream? stream;
         private Gdk.PixbufLoader loader;
         private uint update_timeout_id = 0;
+        private uint hover_timeout_id = 0;
         private Marlin.DeepCount? deep_counter = null;
         private uint deep_count_timeout_id = 0;
         private Gtk.Spinner spinner;
 
         public bool showbar = false;
 
-        public OverlayBar (Marlin.View.Window win, Gtk.Overlay overlay) {
+        public OverlayBar (Gtk.Overlay overlay) {
             base (overlay); /* this adds the overlaybar to the overlay (ViewContainer) */
 
             buffer = new uint8[IMAGE_LOADER_BUFFER_SIZE];
@@ -77,14 +78,16 @@
             cancel ();
             visible = false;
 
-            if (!showbar)
+            if (!showbar) {
                 return;
+            }
 
             update_timeout_id = GLib.Timeout.add_full (GLib.Priority.LOW, STATUS_UPDATE_DELAY, () => {
-                if (files != null)
+                if (files != null) {
                     selected_files = files.copy ();
-                else
+                } else {
                     selected_files = null;
+                }
 
                 real_update (selected_files);
                 update_timeout_id = 0;
@@ -97,7 +100,7 @@
         }
 
         public void update_hovered (GOF.File? file) {
-            cancel (); /* This will stop and hide spinner */
+            hover_cancel (); /* This will stop and hide spinner, and reset the hover timeout */
 
             if (!showbar)
                 return;
@@ -106,20 +109,21 @@
                 visible = false;
             }
 
-            update_timeout_id = GLib.Timeout.add_full (GLib.Priority.LOW, STATUS_UPDATE_DELAY, () => {
+            hover_timeout_id = GLib.Timeout.add_full (GLib.Priority.LOW, STATUS_UPDATE_DELAY, () => {
                 GLib.List<GOF.File> list = null;
                 if (file != null) {
                     bool matched = false;
                     if (selected_files != null) {
                         selected_files.@foreach ((f) => {
-                            if (f == file)
+                            if (f == file) {
                                 matched = true;
+                            }
                         });
                     }
 
-                    if (matched)
+                    if (matched) {
                         real_update (selected_files);
-                    else {
+                    } else {
                         list.prepend (file);
                         real_update (list);
                     }
@@ -127,17 +131,28 @@
                     real_update (null);
                 }
 
-                update_timeout_id = 0;
+                hover_timeout_id = 0;
                 return false;
             });
         }
 
-        public void cancel() {
+        /** Function to be called when view is going to be destroyed or going to show another folder
+ *        * and on a selection change.
+*         **/
+        public void cancel () {
+            hover_cancel ();
             if (update_timeout_id > 0) {
                 GLib.Source.remove (update_timeout_id);
                 update_timeout_id = 0;
             }
+        }
 
+        private void hover_cancel() {
+            /* Do not cancel updating of selected files when hovered file changes */
+            if (hover_timeout_id > 0) {
+                GLib.Source.remove (hover_timeout_id);
+                hover_timeout_id = 0;
+            }
             if (deep_count_timeout_id > 0) {
                 GLib.Source.remove (deep_count_timeout_id);
                 deep_count_timeout_id = 0;

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2016-11-08 19:15:21 +0000
+++ src/View/ViewContainer.vala	2016-11-27 19:11:42 +0000
@@ -94,7 +94,7 @@
         /* Initial location now set by Window.make_tab after connecting signals */
         public ViewContainer (Marlin.View.Window win) {
             window = win;
-            overlay_statusbar = new OverlayBar (win, this);
+            overlay_statusbar = new OverlayBar (this);
             browser = new Browser ();
 
             /* Override background color to support transparency on overlay widgets */