Merge lp:~nick-dedekind/unity/lp1053316.dash-input-form-factor into lp:unity

[Nick Dedekind]

Relayout dash input window when form factor changes (LP#1053316)

Relayout dash input window when form factor changes (LP#1053316)

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-09-19 19:54:05 +0000
+++ dash/DashController.cpp	2012-09-20 10:21:19 +0000
@@ -79,6 +79,9 @@
   {
     if (window_ && view_  && visible_)
     {
+      // Relayout here so the input window size updates.
+      Relayout();
+      
       window_->PushToFront();
       window_->SetInputFocus();
       nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-09-19 22:45:01 +0000
+++ dash/DashView.cpp	2012-09-20 10:21:19 +0000
@@ -107,10 +107,6 @@
   SetupViews();
   SetupUBusConnections();
 
-  Settings::Instance().form_factor.changed.connect([this](FormFactor) {
-    Relayout();
-  });
-
   lenses_.lens_added.connect(sigc::mem_fun(this, &DashView::OnLensAdded));
   mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));
   preview_state_machine_.PreviewActivated.connect(sigc::mem_fun(this, &DashView::BuildPreview));