From 5d672fafc4f285287c07a63ccc4636b8d09b6282 Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Wed, 20 Mar 2019 14:47:39 +0100
Subject: [PATCH] ui: edit search element on backspace instead of deleting
 (issue #681)

---
 src/lib/data/indexer/TaskExecuteCustomCommands.cpp |  4 ++--
 src/lib/data/indexer/TaskExecuteCustomCommands.h   |  6 +++---
 src/lib_gui/qt/element/QtSmartSearchBox.cpp        | 12 +-----------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/lib/data/indexer/TaskExecuteCustomCommands.cpp b/src/lib/data/indexer/TaskExecuteCustomCommands.cpp
index 06e2b01c..6c7f4492 100644
--- a/src/lib/data/indexer/TaskExecuteCustomCommands.cpp
+++ b/src/lib/data/indexer/TaskExecuteCustomCommands.cpp
@@ -17,7 +17,7 @@ TaskExecuteCustomCommands::TaskExecuteCustomCommands(
 	std::unique_ptr<IndexerCommandProvider> indexerCommandProvider,
 	std::shared_ptr<PersistentStorage> storage,
 	std::shared_ptr<DialogView> dialogView,
-	int indexerThreadCount,
+	size_t indexerThreadCount,
 	const FilePath& projectDirectory
 )
 	: m_indexerCommandProvider(std::move(indexerCommandProvider))
@@ -227,7 +227,7 @@ void TaskExecuteCustomCommands::runIndexerCommand(std::shared_ptr<IndexerCommand
 				MessageShowStatus().dispatch();
 				MessageStatus(
 					L"command \"" + indexerCommand->getCustomCommand() + L"\" returned code \"" + std::to_wstring(result) + L"\"" +
-					L" with message \"" + errorMessage + L"\"" + 
+					L" with message \"" + errorMessage + L"\"" +
 					L" and output \"" + processOutput + L"\".", true, false, true).dispatch();
 			}
 		}
diff --git a/src/lib/data/indexer/TaskExecuteCustomCommands.h b/src/lib/data/indexer/TaskExecuteCustomCommands.h
index bc9ece65..3c42d4ab 100644
--- a/src/lib/data/indexer/TaskExecuteCustomCommands.h
+++ b/src/lib/data/indexer/TaskExecuteCustomCommands.h
@@ -24,7 +24,7 @@ public:
 		std::unique_ptr<IndexerCommandProvider> indexerCommandProvider,
 		std::shared_ptr<PersistentStorage> storage,
 		std::shared_ptr<DialogView> dialogView,
-		int indexerThreadCount,
+		size_t indexerThreadCount,
 		const FilePath& projectDirectory);
 
 private:
@@ -41,12 +41,12 @@ private:
 	std::unique_ptr<IndexerCommandProvider> m_indexerCommandProvider;
 	std::shared_ptr<PersistentStorage> m_storage;
 	std::shared_ptr<DialogView> m_dialogView;
-	const int m_indexerThreadCount;
+	const size_t m_indexerThreadCount;
 	const FilePath m_projectDirectory;
 
 	TimeStamp m_start;
 	bool m_interrupted = false;
-	int m_indexerCommandCount;
+	size_t m_indexerCommandCount;
 	std::vector<std::shared_ptr<IndexerCommandCustom>> m_serialCommands;
 	std::vector<std::shared_ptr<IndexerCommandCustom>> m_parallelCommands;
 	std::mutex m_parallelCommandsMutex;
diff --git a/src/lib_gui/qt/element/QtSmartSearchBox.cpp b/src/lib_gui/qt/element/QtSmartSearchBox.cpp
index 1dab50bf..78309e78 100644
--- a/src/lib_gui/qt/element/QtSmartSearchBox.cpp
+++ b/src/lib_gui/qt/element/QtSmartSearchBox.cpp
@@ -283,8 +283,7 @@ void QtSmartSearchBox::keyPressEvent(QKeyEvent* event)
 		}
 		else if (!hasSelectedText() && cursorPosition() == 0 && m_cursorIndex > 0)
 		{
-			m_elements[m_cursorIndex - 1]->setChecked(true);
-			deleteSelectedElements();
+			editElement(m_elements[m_cursorIndex - 1]);
 			return;
 		}
 	}
@@ -595,15 +594,6 @@ void QtSmartSearchBox::onTextEdited(const QString& text)
 		}
 	}
 
-	if (!match.name.empty() && lastMatchIsNoFilter())
-	{
-		if (!m_matches.empty())
-		{
-			matchesChanged = true;
-		}
-		clearMatches();
-	}
-
 	if (matchesChanged)
 	{
 		setEditText(QString::fromStdWString(match.getFullName()));