mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 11:00:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in the incremental search and in find previous occurrence

Browse Source 
Fixed the bug reported by @pamtbaau for the incremental search and the
bug noted by @MKleusberg for the find-previous, both described at #1220
This commit is contained in:
mgr
2017-11-16 22:38:16 +01:00
parent ade562769a
commit 23155a72d4
1 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/SqlExecutionArea.cpp
View File

@@ -134,6 +134,15 @@ void SqlExecutionArea::reloadSettings()
void SqlExecutionArea::find(QString expr, bool forward)
{
// For finding the previous occurrence, we need to skip the current
// selection, otherwise we'd always found the same occurrence.
if (!forward && ui->editEditor->hasSelectedText()) {
int lineFrom, indexFrom;
int lineTo, indexTo;
ui->editEditor->getSelection(&lineFrom, &indexFrom, &lineTo, &indexTo);
ui->editEditor->setCursorPosition(lineFrom, indexFrom);
}
bool found = ui->editEditor->findFirst
(expr,
ui->regexpCheckBox->isChecked(),
@@ -143,17 +152,16 @@ void SqlExecutionArea::find(QString expr, bool forward)
forward);
// Set reddish background when not found
if (found || expr == "")
ui->findLineEdit->setStyleSheet("");
if (found)
ui->findLineEdit->setStyleSheet("");
else
ui->findLineEdit->setStyleSheet("color: white; background-color: rgb(255, 102, 102)");
ui->findLineEdit->setStyleSheet("color: white; background-color: rgb(255, 102, 102)");
}
void SqlExecutionArea::findPrevious()
{
find(ui->findLineEdit->text(), false);
ui->editEditor->findNext();
}
void SqlExecutionArea::findNext()
@@ -163,7 +171,29 @@ void SqlExecutionArea::findNext()
void SqlExecutionArea::findLineEdit_textChanged(const QString &)
{
findNext();
// When the text changes, perform an incremental search from cursor
// position, or from begin of the selection position.
// Reset reddish background when the user has deleted the input,
// otherwise search the text forward.
if (ui->findLineEdit->text() == "")
ui->findLineEdit->setStyleSheet("");
else {
// For incremental search while typing we need to start from the
// begining of the current selection, otherwise we'd jump to the
// next occurrence
if (ui->editEditor->hasSelectedText()) {
int lineFrom;
int indexFrom;
int lineTo;
int indexTo;
ui->editEditor->getSelection(&lineFrom, &indexFrom, &lineTo, &indexTo);
ui->editEditor->setCursorPosition(lineFrom, indexFrom);
}
find(ui->findLineEdit->text(), true);
}
}
void SqlExecutionArea::setFindFrameVisibility(bool show)