← Back to branch summary

~townsend/unity/fix-dash-page-up-down

« back to all changes in this revision

Viewing changes to launcher/LauncherController.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/LauncherController.cpp
244
244
{
245
245
  static bool keynav_first_focus = false;
246
246
 
247
 
  if (parent_->IsOverlayOpen())
 
247
  if (parent_->IsOverlayOpen() || launcher_->GetParent()->GetInputWindowId() == xid)
248
248
    keynav_first_focus = false;
249
249
 
250
250
  if (keynav_first_focus)