Merge lp:~mhr3/unity/fix-961338 into lp:unity

[Michal Hruby]

Set proper view_type on lenses when they're activated by shortcut

UNBLOCK - The lens' view type didn't get updated when a lens was activated by a shortcut, this caused the lens to ignore changes to filters.

Properly update the view_type.

Added AP test for the issue.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Good catch. Looking correct.

review: Approve

[Gord Allott (gordallott)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-03-21 16:37:50 +0000
+++ plugins/unityshell/src/DashView.cpp	2012-03-22 10:03:19 +0000
@@ -139,6 +139,12 @@
       LOG_DEBUG(logger) << "Setting ViewType " << ViewType::LENS_VIEW
                                 << " on '" << home_lens_->id() << "'";
   }
+  else if (active_lens_view_)
+  {
+    // careful here, the lens_view's view_type doesn't get reset when the dash
+    // hides, but lens' view_type does, so we need to update the lens directly
+    active_lens_view_->lens()->view_type = ViewType::LENS_VIEW;
+  }
 
   renderer_.AboutToShow();
 }

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-03-21 12:31:11 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-03-22 10:03:19 +0000
@@ -423,6 +423,53 @@
         lens = self.dash.get_current_lens()
         self.assertTrue(lens.no_results_active)
 
+    def test_results_update_on_filter_changed(self):
+        """This test makes sure the results change when filters change."""
+        self.dash.reveal_application_lens()
+        lens = self.dash.get_current_lens()
+        self.keyboard.type(" ")
+        sleep(1)
+        results_category = lens.get_category_by_name("Installed")
+        old_results = results_category.get_results()
+
+        
+        def activate_filter(add_cleanup = False):
+            # Tabs to last category
+            for i in range(lens.get_num_visible_categories()):
+                self.keyboard.press_and_release('Tab')
+
+            self.keyboard.press_and_release('Tab')
+            searchbar = self.dash.get_searchbar()
+            self.assertTrue(searchbar.expander_has_focus)
+
+            filter_bar = lens.get_filterbar()
+            if not searchbar.showing_filters:
+                self.keyboard.press_and_release('Enter')
+                self.assertTrue(searchbar.showing_filters)
+                if add_cleanup: self.addCleanup(filter_bar.ensure_collapsed)
+
+            # Tab to the "Type" filter in apps lens
+            self.keyboard.press_and_release('Tab')
+            new_focused_filter = filter_bar.get_focused_filter()
+            self.assertIsNotNone(new_focused_filter)
+
+            self.keyboard.press_and_release("Down")
+            self.keyboard.press_and_release("Down")
+            self.keyboard.press_and_release("Down")
+            # We should be on the Education category
+            self.keyboard.press_and_release('Enter')
+
+        activate_filter(True)
+        self.addCleanup(activate_filter)
+
+        sleep(1)
+        results_category = lens.get_category_by_name("Installed")
+        results = results_category.get_results()
+        self.assertIsNot(results, old_results)
+
+        # so we can clean up properly
+        self.keyboard.press_and_release('BackSpace')
+
 
 class DashVisualTests(DashTestCase):
     """Tests that the dash visual is correct."""