← Back to branch summary

~3v1n0/unity/scale-window-cast-protection

« back to all changes in this revision

Viewing changes to launcher/LauncherController.cpp

  • Committer: Andrea Azzarone
  • Date: 2015-03-20 16:23:04 UTC
  • mto: This revision was merged to the branch mainline in revision 3937.
  • Revision ID: azzaronea@gmail.com-20150320162304-0cdjhxkt79sivgkw
Do not refocus window when opening a quicklist during launcher key navigation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/LauncherController.cpp
158
158
 
159
159
  ubus.RegisterInterest(UBUS_QUICKLIST_END_KEY_NAV, [this](GVariant * args) {
160
160
    if (reactivate_keynav)
 
161
    {
161
162
      parent_->KeyNavGrab();
 
163
      keynav_restore_window_ = true;
 
164
    }
162
165
 
163
166
    model_->SetSelection(reactivate_index);
164
167
    AbstractLauncherIcon::Ptr const& selected = model_->Selection();
1506
1509
 
1507
1510
void Controller::Impl::OpenQuicklist()
1508
1511
{
1509
 
  if (model_->Selection()->OpenQuicklist(true, keyboard_launcher_->monitor()))
 
1512
  if (model_->Selection()->OpenQuicklist(true, keyboard_launcher_->monitor(), keynav_restore_window_))
1510
1513
  {
 
1514
    keynav_restore_window_ = false;
1511
1515
    reactivate_keynav = true;
1512
1516
    reactivate_index = model_->SelectionIndex();
1513
1517
    parent_->KeyNavTerminate(false);