Changeset 78484 in vbox for trunk/src/VBox

Timestamp:

May 13, 2019 1:36:02 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130522

Message:

FE/Qt: bugref:9072. Using block count instead of line count.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp

@@ -27 +27 @@
 #include <QLineEdit>
 #include <QPlainTextEdit>
+#include <QScrollBar>
 #include <QTextBlock>
 
@@ -494 +495 @@
     QTextCursor cursor(pDocument);
     QTextDocument::FindFlags flags = constructFindFlags(ForwardSearch);
-    int lineCount = pDocument->lineCount();
+    int blockCount = pDocument->blockCount();
     while (!cursor.isNull() && !cursor.atEnd())
     {
@@ -504 +505 @@
             /* The following assumes we have single line blocks only: */
             int cursorLine = pDocument->findBlock(cursor.position()).blockNumber();
-            if (lineCount != 0)
-                m_matchLocationVector.push_back(cursorLine / static_cast<float>(lineCount));
+            if (blockCount != 0)
+                m_matchLocationVector.push_back(cursorLine / static_cast<float>(blockCount));
         }
     }
@@ -523 +524 @@
     cursor.setPosition(m_matchedCursorPosition.at(iMatchIndex), QTextCursor::MoveAnchor);
     /* Move the cursor to the end of the matched string while keeping the anchor at the begining thus selecting the text: */
-    cursor.setPosition(m_matchedCursorPosition.at(iMatchIndex)+searchString.length(), QTextCursor::KeepAnchor);
+    cursor.setPosition(m_matchedCursorPosition.at(iMatchIndex) + searchString.length(), QTextCursor::KeepAnchor);
+    textEdit()->ensureCursorVisible();
     textEdit()->setTextCursor(cursor);
     return;