Merge lp:~dfly720/unity/fix-938353 into lp:unity

[Marco Mariani]

== Problem ==

Starting switcher in detail mode shows wrong label.

== Fix ==

Fix SwitcherView::SetModel

Now if you initiate the switcher in details mode, it show the *window title* and not the *application name*.

== Test ==

AP test added.

[Andrea Azzarone (azzar1)]

SwitcherView.cpp code looks good to me.

review: Approve

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2012-05-07 19:52:54 +0000
+++ launcher/SwitcherView.cpp	2012-05-31 23:49:21 +0000
@@ -106,7 +106,8 @@
   .add("vertical-size", vertical_size)
   .add("text-size", text_size)
   .add("animation-length", animation_length)
-  .add("spread-size", (float)spread_size);
+  .add("spread-size", (float)spread_size)
+  .add("label", text_view_->GetText());
 }
 
 
@@ -124,8 +125,18 @@
   model->detail_selection.changed.connect (sigc::mem_fun (this, &SwitcherView::OnDetailSelectionChanged));
   model->detail_selection_index.changed.connect (sigc::mem_fun (this, &SwitcherView::OnDetailSelectionIndexChanged));
 
-  if (model->Selection())
+  if (!model->Selection())
+    return;
+
+  if (model->detail_selection)
+  {
+    Window detail_window = model->DetailSelectionWindow();
+    text_view_->SetText(model->Selection()->NameForWindow(detail_window));
+  }
+  else
+  {
     text_view_->SetText(model->Selection()->tooltip_text());
+  }
 }
 
 void SwitcherView::OnIconSizeChanged (int size)

=== modified file 'tests/autopilot/unity/emulators/switcher.py'
--- tests/autopilot/unity/emulators/switcher.py	2012-05-08 16:13:17 +0000
+++ tests/autopilot/unity/emulators/switcher.py	2012-05-31 23:49:21 +0000
@@ -91,7 +91,7 @@
         elif mode == SwitcherMode.DETAIL:
             logger.debug("Initiating switcher detail mode with Alt+`")
             self.keybinding_hold_part_then_tap("switcher/reveal_details")
-            self.controller.model.detail_selection.wait_for(True)
+            self.visible.wait_for(True)
         elif mode == SwitcherMode.ALL:
             logger.debug("Initiating switcher in 'all workspaces' mode. Ctrl+Alt+Tab")
             self.keybinding_hold_part_then_tap("switcher/reveal_all")

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2012-05-08 16:13:17 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2012-05-31 23:49:21 +0000
@@ -49,6 +49,23 @@
         self.addCleanup(self.switcher.terminate)
         self.assertThat(self.switcher.mode, Equals(SwitcherMode.NORMAL))
 
+    def test_first_detail_mode_has_correct_label(self):
+        """Tests that details mode shows the correct label the first time.
+        """
+        app = self.start_app("Text Editor")
+        sleep(1)
+        self.switcher.initiate(SwitcherMode.DETAIL)
+        self.addCleanup(self.switcher.terminate)
+
+        title = ""
+        for window in app.get_windows():
+            if (window.is_focused):
+                title = window.title
+                break
+
+        self.assertThat(self.switcher.controller.view.label, Eventually(Equals(title)))
+
+
     def test_switcher_move_next(self):
         """Test that pressing the next icon binding moves to the next icon"""
         self.switcher.initiate()