summaryrefslogtreecommitdiff
path: root/src/findbar.cpp
diff options
context:
space:
mode:
authorBenjamin Poulain <benjamin.poulain@nokia.com>2010-11-20 19:05:33 +0100
committerBenjamin Poulain <benjamin.poulain@nokia.com>2010-11-20 19:10:14 +0100
commit11769558f3f9107c45457ba7c735a1991e42f625 (patch)
treeffd7057c77794364291a030aa73aa534fb0ea863 /src/findbar.cpp
parentRemove the destructor of MainView (diff)
parentFix markup: (diff)
downloadrekonq-11769558f3f9107c45457ba7c735a1991e42f625.tar.xz
Merge branch 'master' of git://git.kde.org/rekonq
Conflicts: src/mainview.cpp src/mainview.h src/webtab.cpp src/webtab.h
Diffstat (limited to 'src/findbar.cpp')
-rw-r--r--src/findbar.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 3f7825da..158849f9 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -31,6 +31,8 @@
// Local Includes
#include "mainwindow.h"
+#include "webtab.h"
+#include "webpage.h"
// KDE Includes
#include <KApplication>
@@ -154,6 +156,13 @@ bool FindBar::highlightAllState() const
void FindBar::setVisible(bool visible)
{
+ if (visible && m_mainWindow->currentTab()->page()->isOnRekonqPage() && m_mainWindow->currentTab()->part() != 0)
+ {
+ // findNext is the slot containing part integration code
+ m_mainWindow->findNext();
+ return;
+ }
+
QWidget::setVisible(visible);
if (visible)