feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BinEditor: Support wrapping on find

Browse Source 
Change-Id: I7a87908d084208ac1d975d0686905cd3412e120f
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Orgad Shaneh
2013-07-16 12:36:14 +03:00
committed by hjk
parent c4a3dbe38f
commit 12a32f145c
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/bineditor/bineditor.cpp
View File

@@ -582,6 +582,8 @@ int BinEditorWidget::dataLastIndexOf(const QByteArray &pattern, int from, bool c
buffer.resize(m_blockSize + trailing); buffer.resize(m_blockSize + trailing);
char *b = buffer.data(); char *b = buffer.data();
if (from == -1)
from = m_size;
int block = from / m_blockSize; int block = from / m_blockSize;
const int lowerBound = qMax(0, from - SearchStride); const int lowerBound = qMax(0, from - SearchStride);
while (from > lowerBound) { while (from > lowerBound) {

30
src/plugins/bineditor/bineditorplugin.cpp
View File

@@ -73,6 +73,7 @@ public:
{ {
m_widget = widget; m_widget = widget;
m_incrementalStartPos = m_contPos = -1; m_incrementalStartPos = m_contPos = -1;
m_incrementalWrappedState = false;
} }
bool supportsReplace() const { return false; } bool supportsReplace() const { return false; }
@@ -87,6 +88,7 @@ public:
void resetIncrementalSearch() void resetIncrementalSearch()
{ {
m_incrementalStartPos = m_contPos = -1; m_incrementalStartPos = m_contPos = -1;
m_incrementalWrappedState = false;
} }
virtual void highlightAll(const QString &txt, Find::FindFlags findFlags) virtual void highlightAll(const QString &txt, Find::FindFlags findFlags)
@@ -99,14 +101,25 @@ public:
m_widget->highlightSearchResults(QByteArray()); m_widget->highlightSearchResults(QByteArray());
} }
int find(const QByteArray &pattern, int pos, Find::FindFlags findFlags) int find(const QByteArray &pattern, int pos, Find::FindFlags findFlags, bool *wrapped)
{ {
if (wrapped)
*wrapped = false;
if (pattern.isEmpty()) { if (pattern.isEmpty()) {
m_widget->setCursorPosition(pos); m_widget->setCursorPosition(pos);
return pos; return pos;
} }
return m_widget->find(pattern, pos, Find::textDocumentFlagsForFindFlags(findFlags)); int res = m_widget->find(pattern, pos, Find::textDocumentFlagsForFindFlags(findFlags));
if (res < 0) {
pos = (findFlags & Find::FindBackward) ? -1 : 0;
res = m_widget->find(pattern, pos, Find::textDocumentFlagsForFindFlags(findFlags));
if (res < 0)
return res;
if (wrapped)
*wrapped = true;
}
return res;
} }
Result findIncremental(const QString &txt, Find::FindFlags findFlags) { Result findIncremental(const QString &txt, Find::FindFlags findFlags) {
@@ -118,7 +131,12 @@ public:
m_incrementalStartPos = m_widget->selectionStart(); m_incrementalStartPos = m_widget->selectionStart();
if (m_contPos == -1) if (m_contPos == -1)
m_contPos = m_incrementalStartPos; m_contPos = m_incrementalStartPos;
int found = find(pattern, m_contPos, findFlags); bool wrapped;
int found = find(pattern, m_contPos, findFlags, &wrapped);
if (wrapped != m_incrementalWrappedState && (found >= 0)) {
m_incrementalWrappedState = wrapped;
showWrapIndicator(m_widget);
}
Result result; Result result;
if (found >= 0) { if (found >= 0) {
result = Found; result = Found;
@@ -147,7 +165,10 @@ public:
if (findFlags & Find::FindBackward) if (findFlags & Find::FindBackward)
m_contPos = m_widget->selectionStart()-1; m_contPos = m_widget->selectionStart()-1;
} }
int found = find(pattern, m_contPos, findFlags); bool wrapped;
int found = find(pattern, m_contPos, findFlags, &wrapped);
if (wrapped)
showWrapIndicator(m_widget);
Result result; Result result;
if (found >= 0) { if (found >= 0) {
result = Found; result = Found;
@@ -171,6 +192,7 @@ private:
BinEditorWidget *m_widget; BinEditorWidget *m_widget;
int m_incrementalStartPos; int m_incrementalStartPos;
int m_contPos; // Only valid if last result was NotYetFound. int m_contPos; // Only valid if last result was NotYetFound.
bool m_incrementalWrappedState;
QByteArray m_lastPattern; QByteArray m_lastPattern;
}; };