Changeset 88737 in vbox for trunk/src/VBox

Timestamp:

Apr 27, 2021 2:10:49 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Updating search better with tab change

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerSearchPanel.cpp (modified) (2 diffs)
• UIVMLogViewerSearchPanel.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (1 diff)

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

@@ -58 +58 @@
 {
     /* We start the search from the end of the doc. assuming log's end is more interesting: */
-    performSearch(BackwardSearch, true);
+    if (isVisible())
+        performSearch(BackwardSearch, true);
+    else
+        reset();
+
     emit sigHighlightingUpdated();
 }
@@ -69 +73 @@
     if (m_pSearchEditor)
         m_pSearchEditor->reset();
+    emit sigHighlightingUpdated();
 }
 

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

@@ -55 +55 @@
     /** Resets the search position and starts a new search. */
     void refresh();
-    void reset();
     const QVector<float> &matchLocationVector() const;
     virtual QString panelName() const /* override */;
@@ -104 +103 @@
     /** Searches the whole document and return the number of matches to the current search term. */
     int countMatches(QTextDocument *pDocument, const QString &searchString) const;
+    void reset();
+
     /** Holds the instance of search-editor we create. */
     UISearchLineEdit *m_pSearchEditor;

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

@@ -417 +417 @@
 {
     /* Reapply the search to get highlighting etc. correctly */
-    if (m_pSearchPanel && m_pSearchPanel->isVisible())
+    if (m_pSearchPanel)
         m_pSearchPanel->refresh();
 }