Merge lp:~jeremywootten/pantheon-files/fix-1639228-switch-tabs-in-column-view-not-update-pathbar into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix breadcrumb update on column view tab switch

Column view must always emit "active" signal when one of its slots is activated, even if it is already the current slot. This is so pathbar and other UI changes when switching back to the tab.

TO TEST:

1. Create two tabs, one of which is in Column View.
2. Select the Column View tab.
3. Select the other tab.
4 Reselect the Column View tab

In trunk, the path bar does not change back to the correct path when reselecting the Column View.

In this branch, the correct path is always shown.

[Zisu Andrei (matzipan)]

I can confirm this fixes the issue and doesn't introduce any regressions.

review: Approve

=== modified file 'src/View/Miller.vala'
--- src/View/Miller.vala	2016-07-19 08:32:27 +0000
+++ src/View/Miller.vala	2016-11-08 19:28:24 +0000
@@ -303,15 +303,15 @@
                 schedule_scroll_to_slot (slot, animate);
             }
 
-            if (this.current_slot == slot)
-                return;
-
-            slot_list.@foreach ((s) => {
-                if (s != slot)
-                    s.inactive ();
-            });
-
-            current_slot = slot;
+            if (this.current_slot != slot) {
+                slot_list.@foreach ((s) => {
+                    if (s != slot)
+                        s.inactive ();
+                });
+
+                current_slot = slot;
+            }
+            /* Always emit this signal so that UI updates (e.g. pathbar) */
             active ();
         }
 

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2016-09-18 10:37:53 +0000
+++ src/View/ViewContainer.vala	2016-11-08 19:28:24 +0000
@@ -429,7 +429,9 @@
             if (aslot != null) {
                 /* Since async loading it may not have been determined whether slot is loadable */
                 aslot.set_active_state (is_active, animate);
-                active ();
+                if (is_active) {
+                    active ();
+                }
             }
         }
 

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-09-25 20:38:35 +0000
+++ src/View/Window.vala	2016-11-08 19:28:24 +0000
@@ -1018,8 +1018,9 @@
         }
 
         private void update_top_menu () {
-            if (restoring_tabs || current_tab == null)
+            if (restoring_tabs || current_tab == null) {
                 return;
+            }
 
             /* Update browser buttons */
             top_menu.set_back_menu (current_tab.get_go_back_path_list ());