Merge lp:~nick-dedekind/unity/smart-scopes.dash-focus into lp:~unity-team/unity/libunity-7.0-breakage

[Nick Dedekind]

Now matches unity trunk dash focus mechanism.

Now matches unity trunk dash focus mechanism.

[Brandon Schaefer (brandontschaefer)]

LGTM :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-03-22 21:28:35 +0000
+++ dash/DashView.cpp	2013-03-25 17:51:21 +0000
@@ -1284,8 +1284,6 @@
     search_bar_->can_refine_search = can_refine_search;
   });
 
-  nux::GetWindowCompositor().SetKeyFocusArea(default_focus());
-
   view->QueueDraw();
   QueueDraw();
 }
@@ -1647,20 +1645,5 @@
   return content_geo_;
 }
 
-bool DashView::SetParentObject(Area *parent)
-{
-  //This is a bit crap and should be fixed in nux.
-  //If you reparent, you need to fix up the focus tree.
-  if (View::SetParentObject(parent))
-  {
-    // Because the scopes are now created synchronously on construction, we wont be parented by the time the focus is updated.
-    InputArea* area = nux::GetWindowCompositor().GetKeyFocusArea();
-    if (area)
-      area->SetPathToKeyFocusArea();
-    return true;
-  }
-  return false;
-}
-
 }
 }
 
=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-03-22 12:44:53 +0000
+++ dash/DashView.h	2013-03-25 17:51:21 +0000
@@ -75,8 +75,6 @@
 
   nux::Geometry const& GetContentGeometry() const;
 
-  virtual bool SetParentObject(Area *parent);
-
 protected:
   void ProcessDndEnter();