Differential D11443 Diff 29804 krusader/BookMan/krbookmarkhandler.cpp

Changeset View

Standalone View

View Options

krusader/BookMan/krbookmarkhandler.cpp

Context not available.
577 // match prefix of the action text to the query 577​ // match prefix of the action text to the query
578 if (act->text().left(_quickSearchText().length()).compare(_quickSearchText(), Qt::CaseInsensitive) == 0) { 578​ if (act->text().left(_quickSearchText().length()).compare(_quickSearchText(), Qt::CaseInsensitive) == 0) {
579 _highlightAction(act); 579​ _highlightAction(act);
580 if (!firstMatch) { 580​ if (!firstMatch || firstMatch->menu()) {
581​ //Can't highlight menus (see comment below), hopefully pick something we can
581 firstMatch = act; 582​ firstMatch = act;
582 } 583​ }
583 nMatches++; 584​ 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) { 597​ if (nMatches == 1) {
597 _setQuickSearchText(""); 598​ _setQuickSearchText("");
598 if ((bool) firstMatch->menu()) { 599​ if ((bool) firstMatch->menu()) {
599 menu->setActiveAction(firstMatch); 600​ menu->setActiveAction(nullptr);
601​ int menuWidth = menu->sizeHint().width();
602​ QPoint submenuPos = menu->mapToGlobal(QPoint(menuWidth, 0));
603​ firstMatch->menu()->exec(submenuPos);
600 } else { 604​ } else {
601 firstMatch->activate(QAction::Trigger); 605​ firstMatch->activate(QAction::Trigger);
602 } 606​ }
603 } else { 607​ return true;
604 // if no match is found, firstMatch == nullptr 608​ } else if (nMatches > 1) {
605 // this is intended as it will unset active item of the menu 609​ //because of a bug submenus cannot be highlighted
606 menu->setActiveAction(firstMatch); 610​ //https://bugreports.qt.io/browse/QTBUG-939
611​ if (!firstMatch->menu()) {
612​ menu->setActiveAction(firstMatch);
613​ } else {
614​ qDebug() << "We only found submenus, highlighting nothing";
615​ menu->setActiveAction(nullptr);
616​ }
617​ return true;
618​ }
619​ else {
620​ menu->setActiveAction(nullptr);
607 } 621​ }
608 } 622​ }
609 623​
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…