diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-02-24 11:39:07 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-02-24 11:39:07 +0100 |
| commit | fde7402105174421318e3556401fe2d5f8cda96b (patch) | |
| tree | ecde7c2daaba33a0bfed0b4af011a65443d4f3cd /src/mainwindow.cpp | |
| parent | Moved away the m_requestedUrl call, using currentFrame()->url(). (diff) | |
| parent | Clean and optimize the findBar code. (diff) | |
| download | rekonq-fde7402105174421318e3556401fe2d5f8cda96b.tar.xz | |
Merge commit 'refs/merge-requests/95' of git://gitorious.org/rekonq/mainline into m95
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ef74adab..39dd9a40 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -777,22 +777,17 @@ void MainWindow::find(const QString & search) findNext(); } + void MainWindow::matchCaseUpdate() { if (!currentTab()) return; - QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument; - - if (m_findBar->matchCase()) - options |= QWebPage::FindCaseSensitively; - currentTab()->view()->findText(m_lastSearch, QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument); - bool found = currentTab()->view()->findText(m_lastSearch, options); - m_findBar->notifyMatch(found); - if(!found) - currentTab()->view()->page()->focusNextPrevChild(true); + findNext(); } + + void MainWindow::findNext() { if (!currentTab()) @@ -819,12 +814,6 @@ void MainWindow::findPrevious() { if (!currentTab()) return; - - if(m_findBar->isHidden()) - { - currentTab()->view()->page()->focusNextPrevChild(true); - return; - } QWebPage::FindFlags options = QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument; if (m_findBar->matchCase()) |