From 65f0f138d29e1f34626d8a25683bfe0a059fb8dc Mon Sep 17 00:00:00 2001
From: Yoann Laissus <yoann.laissus@gmail.com>
Date: Sun, 14 Mar 2010 23:34:45 +0100
Subject: Clear all the highlight when the find bar is closed with the esc key

---
 src/findbar.cpp    | 1 -
 src/mainwindow.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 7cbe9d17..c97fd1f9 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -69,7 +69,6 @@ FindBar::FindBar(QWidget *parent)
     hideButton->setAutoRaise(true);
     hideButton->setIcon(KIcon("dialog-close"));
     connect(hideButton, SIGNAL(clicked()), this, SLOT(hide()));
-    connect(hideButton, SIGNAL(clicked()), window, SLOT(highlightAll()));
     layout->addWidget(hideButton);
     layout->setAlignment(hideButton, Qt::AlignLeft | Qt::AlignTop);
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e90a5903..b5df7acb 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -786,6 +786,8 @@ void MainWindow::findNext()
     if (!currentTab())
         return;
 
+    highlightAll();
+    
     if(m_findBar->isHidden())
     {
         QPoint previous_position = currentTab()->view()->page()->currentFrame()->scrollPosition();
@@ -794,8 +796,6 @@ void MainWindow::findNext()
         return;
     }
     
-    highlightAll();
-    
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (m_findBar->matchCase())
         options |= QWebPage::FindCaseSensitively;
-- 
cgit v1.2.1