1 files changed, 20 insertions, 0 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 60784af0..e90a5903 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -794,6 +794,8 @@ void MainWindow::findNext()
         return;
     }
     
+    highlightAll();
+    
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
         options |= QWebPage::FindCaseSensitively;
@@ -823,6 +825,24 @@ void MainWindow::findPrevious()
     m_findBar->notifyMatch(found);
 }
 
+void MainWindow::highlightAll()
+{
+    if (!currentTab())
+        return;
+    
+    QWebPage::FindFlags options = QWebPage::HighlightAllOccurrences;
+    
+    currentTab()->view()->findText("", options); //Clear an existing highlight
+    
+    if(m_findBar->highlightAllState() && !m_findBar->isHidden())
+    {
+	if (m_findBar->matchCase())
+	    options |= QWebPage::FindCaseSensitively;
+
+        currentTab()->view()->findText(m_lastSearch, options);
+    }
+}
+
 
 void MainWindow::zoomIn()
 {