Differential D11443 Diff 29837 krusader/BookMan/krbookmarkhandler.cpp

Changeset View

Standalone View

View Options

krusader/BookMan/krbookmarkhandler.cpp

Context not available.
529 bool quickSearchStarted = false; 529​ bool quickSearchStarted = false;
530 530​
531 if (kev->modifiers() != Qt::NoModifier || 531​ if (kev->modifiers() != Qt::NoModifier ||
532 kev->text().isEmpty() || 532​ kev->text().isEmpty() ||
533 kev->key() == Qt::Key_Delete) { 533​ kev->key() == Qt::Key_Delete ||
534​ kev->key() == Qt::Key_Escape) {
534 return QObject::eventFilter(obj, ev); 535​ return QObject::eventFilter(obj, ev);
535 } 536​ }
536 537​
Context not available.
577 // match prefix of the action text to the query 578​ // match prefix of the action text to the query
578 if (act->text().left(_quickSearchText().length()).compare(_quickSearchText(), Qt::CaseInsensitive) == 0) { 579​ if (act->text().left(_quickSearchText().length()).compare(_quickSearchText(), Qt::CaseInsensitive) == 0) {
579 _highlightAction(act); 580​ _highlightAction(act);
580 if (!firstMatch) { 581​ if (!firstMatch || firstMatch->menu()) {
582​ //Can't highlight menus (see comment below), hopefully pick something we can
581 firstMatch = act; 583​ firstMatch = act;
582 } 584​ }
583 nMatches++; 585​ nMatches++;
nmelUnsubmitted
Not Done

firstMatch no longer corresponds to its name. It's the last match of a folder or the first match of a bookmark. Either rename (what's a good name?) or use two vars firstBookmarkMatch and firstFolderMatch.

nmel: firstMatch no longer corresponds to its name. It's the last match of a folder or the first…
Context not available.
596 if (nMatches == 1) { 598​ if (nMatches == 1) {
597 _setQuickSearchText(""); 599​ _setQuickSearchText("");
598 if ((bool) firstMatch->menu()) { 600​ if ((bool) firstMatch->menu()) {
599 menu->setActiveAction(firstMatch); 601​ menu->setActiveAction(nullptr);
602​ QRect firstMatchGeom = menu->actionGeometry(firstMatch);
603​ QPoint submenuPos = menu->mapToParent(firstMatchGeom.topRight());
604​ firstMatch->menu()->popup(submenuPos);
600 } else { 605​ } else {
601 firstMatch->activate(QAction::Trigger); 606​ firstMatch->activate(QAction::Trigger);
602 } 607​ }
603 } else { 608​ return true;
604 // if no match is found, firstMatch == nullptr 609​ } else if (nMatches > 1) {
605 // this is intended as it will unset active item of the menu 610​ //because of a bug submenus cannot be highlighted
606 menu->setActiveAction(firstMatch); 611​ //https://bugreports.qt.io/browse/QTBUG-939
612​ if (!firstMatch->menu()) {
613​ menu->setActiveAction(firstMatch);
614​ } else {
615​ qDebug() << "We only found submenus, highlighting nothing";
616​ menu->setActiveAction(nullptr);
617​ }
618​ return true;
619​ }
620​ else {
621​ menu->setActiveAction(nullptr);
607 } 622​ }
608 } 623​ }
609 624​
Context not available.
nmelUnsubmitted
Not Done

Why there is no return true in this case?

nmel: Why there is no return true in this case?
radeAuthorUnsubmitted
Not Done

because we didn't find a match, so we haven't dealt with the button press and are sending it along to others who might be able to handle it.

rade: because we didn't find a match, so we haven't dealt with the button press and are sending it…