Merge lp:~gordallott/unity/horribleworkaroundfordashinputwindow into lp:unity

[Gord Allott]

creates input windows and opens/closes them on startup for the HUD and Dash

Fixes an issue in unity where the first time you open the dash or hud, you sometimes get input passed through to whatever window was previously focused. not the greatest fix in the world but it'll have to do for now

UNBLOCK

[Didier Roche-Tolomelli (didrocks)]

It's horrible, I'm powndering rejecting it! </kidding>

Ok, thanks for the quick fix Gord. Confirmed to work and to not trigger the lens loading up at startup.

review: Approve

=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2012-04-05 02:24:31 +0000
+++ plugins/unityshell/src/DashController.cpp	2012-04-12 11:06:26 +0000
@@ -51,9 +51,10 @@
   SetupRelayoutCallbacks();
   RegisterUBusInterests();
 
-
   ensure_id_ = g_timeout_add_seconds(60, [] (gpointer data) -> gboolean { static_cast<Controller*>(data)->EnsureDash(); return FALSE; }, this);
 
+  SetupWindow();
+  
   Settings::Instance().changed.connect([&]()
   {
     if (window_)
@@ -83,6 +84,12 @@
   window_->ShowWindow(false);
   window_->SetOpacity(0.0f);
   window_->mouse_down_outside_pointer_grab_area.connect(sigc::mem_fun(this, &Controller::OnMouseDownOutsideWindow));
+  
+  /* FIXME - first time we load our windows there is a race that causes the input window not to actually get input, this side steps that by causing an input window show and hide before we really need it. */
+  PluginAdapter::Default()->saveInputFocus ();
+  window_->EnableInputWindow(true, "Dash", true, false);
+  window_->EnableInputWindow(false, "Dash", true, false);
+  PluginAdapter::Default()->restoreInputFocus ();
 }
 
 void Controller::SetupDashView()
@@ -136,17 +143,18 @@
 
 void Controller::EnsureDash()
 {
-  if (window_)
-    return;
-
   LOG_DEBUG(logger) << "Initializing Dash";
-
-  SetupWindow();
-  SetupDashView();
-  Relayout();
-  ensure_id_ = 0;
-
-  on_realize.emit();
+  if (!window_)
+    SetupWindow();
+
+  if (!view_)
+  {
+    SetupDashView();
+    Relayout();
+    ensure_id_ = 0;
+
+    on_realize.emit();
+  }
 }
 
 nux::BaseWindow* Controller::window() const

=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-04-04 01:08:52 +0000
+++ plugins/unityshell/src/HudController.cpp	2012-04-12 11:06:26 +0000
@@ -54,6 +54,7 @@
   , type_wait_handle_(0)
 {
   LOG_DEBUG(logger) << "hud startup";
+  SetupWindow();
   UScreen::GetDefault()->changed.connect([&] (int, std::vector<nux::Geometry>&) { Relayout(); });
 
   ubus.RegisterInterest(UBUS_HUD_CLOSE_REQUEST, sigc::mem_fun(this, &Controller::OnExternalHideHud));
@@ -101,6 +102,12 @@
   window_->ShowWindow(false);
   window_->SetOpacity(0.0f);
   window_->mouse_down_outside_pointer_grab_area.connect(sigc::mem_fun(this, &Controller::OnMouseDownOutsideWindow));
+  
+  /* FIXME - first time we load our windows there is a race that causes the input window not to actually get input, this side steps that by causing an input window show and hide before we really need it. */
+  PluginAdapter::Default()->saveInputFocus ();
+  window_->EnableInputWindow(true, "Hud", true, false);
+  window_->EnableInputWindow(false, "Hud", true, false);
+  PluginAdapter::Default()->restoreInputFocus ();
 }
 
 void Controller::SetupHudView()
@@ -145,15 +152,17 @@
 
 void Controller::EnsureHud()
 {
-  if (window_)
-    return;
-
   LOG_DEBUG(logger) << "Initializing Hud";
 
-  SetupWindow();
-  SetupHudView();
-  Relayout();
-  ensure_id_ = 0;
+  if (!window_)
+    SetupWindow();
+  
+  if (!view_)
+  {
+    SetupHudView();
+    Relayout();
+    ensure_id_ = 0;
+  }
 }
 
 nux::BaseWindow* Controller::window() const