Merge lp:~sjakthol/unity/fix-1297842 into lp:unity

[Sami Jaktholm]

Shortcuts: Listen and react to view close requests.

Test case:
1. Run 'rm ~/.cache/unity/first_run.stamp'
2. Restart unity
3. Try closing the shortcut overlay from the cross at the top left corner.

For me it was a bit tricky to test as the overlay didn't appear at all (apparently it required 773 pixels of vertical space and I only had 768 to spare).

I assume that the actual hiding of the overlay is already covered by tests and thus the included unit test only ensures ShortcutController reacts to the request_close signal.

[Marco Trevisan (Treviño) (3v1n0)]

Cool, looks good.

review: Approve

=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2014-03-10 23:44:54 +0000
+++ shortcuts/ShortcutController.cpp	2014-04-05 20:19:09 +0000
@@ -157,6 +157,7 @@
   view_->SetModel(modeller_->GetCurrentModel());
   view_->background_color = WindowManager::Default().average_color();
   view_->closable = first_run();
+  view_->request_close.connect(sigc::mem_fun(this, &Controller::Hide));
 
   if (!view_window_)
   {

=== modified file 'tests/test_shortcut_controller.cpp'
--- tests/test_shortcut_controller.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_shortcut_controller.cpp	2014-04-05 20:19:09 +0000
@@ -219,5 +219,17 @@
   EXPECT_FALSE(controller_.view_->closable());
 }
 
+TEST_F(TestShortcutController, CloseRequestIsHandled)
+{
+  controller_.first_run = true;
+  controller_.ConstructView();
+  controller_.Show();
+  controller_.OnShowTimer();
+  tick_source_.tick(100 * 1000);
+  controller_.view_->request_close.emit();
+
+  EXPECT_FALSE(controller_.Visible());
+}
+
 }
 }