mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-17 20:44:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Extract YACReaderNavigationController::exitSearchMode()

Browse Source
This commit is contained in:
Igor Kushnir
2021-02-12 19:51:24 +02:00
committed by Luis Ángel San Martín
parent 3a60d89f06
commit 40ca07f8f8
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
YACReaderLibrary/yacreader_navigation_controller.cpp
View File

@ -34,10 +34,8 @@ void YACReaderNavigationController::selectedFolder(const QModelIndex &mi)
// update history
libraryWindow->historyController->updateHistory(YACReaderLibrarySourceContainer(modelIndex, YACReaderLibrarySourceContainer::Folder));
if (libraryWindow->status == LibraryWindow::Searching) {
// when a folder is selected the search mode has to be reset
libraryWindow->searchEdit->clearText();
libraryWindow->clearSearchFilter();
// when a folder is selected the search mode has to be reset
if (libraryWindow->exitSearchMode()) {
libraryWindow->foldersView->scrollTo(mi, QAbstractItemView::PositionAtTop);
libraryWindow->foldersView->setCurrentIndex(mi);
}
@ -182,10 +180,9 @@ void YACReaderNavigationController::selectedList(const QModelIndex &mi)
// update history
libraryWindow->historyController->updateHistory(YACReaderLibrarySourceContainer(modelIndex, YACReaderLibrarySourceContainer::List));
if (libraryWindow->status == LibraryWindow::Searching) {
// when a list is selected the search mode has to be reset
libraryWindow->searchEdit->clearText();
libraryWindow->clearSearchFilter();
// when a list is selected the search mode has to be reset
if (libraryWindow->exitSearchMode()) {
libraryWindow->listsView->scrollTo(mi, QAbstractItemView::PositionAtTop);
libraryWindow->listsView->setCurrentIndex(mi);
}
@ -212,12 +209,8 @@ void YACReaderNavigationController::reselectCurrentSource()
void YACReaderNavigationController::selectedIndexFromHistory(const YACReaderLibrarySourceContainer &sourceContainer)
{
// TODO NO searching allowed, just disable backward/forward actions in searching mode
if (libraryWindow->status == LibraryWindow::Searching) {
// when a folder is selected the search mode has to be reset
libraryWindow->searchEdit->clearText();
libraryWindow->clearSearchFilter();
}
// when a folder or a list is selected the search mode has to be reset
libraryWindow->exitSearchMode();
loadIndexFromHistory(sourceContainer);
libraryWindow->setToolbarTitle(sourceContainer.getSourceModelIndex());
}