summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-04-09 23:46:15 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-04-09 23:46:15 +0200
commit8e4f1c77bac6c7c8475b54d22ab5fee366c6db63 (patch)
tree18e2e2cfe7a6b3ce1839091f6fe68b6f5cd2973c /src
parentFixing icons position and saving a couple of moveEvents (diff)
parentRemove trailing space (diff)
downloadrekonq-8e4f1c77bac6c7c8475b54d22ab5fee366c6db63.tar.xz
Merge commit 'refs/merge-requests/118' of git://gitorious.org/rekonq/mainline into m118
Diffstat (limited to 'src')
-rw-r--r--src/findbar.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/findbar.cpp b/src/findbar.cpp
index 7cbe9d17..48a3c4e0 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -143,15 +143,14 @@ bool FindBar::highlightAllState() const
void FindBar::show()
{
// show findbar if not visible
- if (isVisible())
- return;
-
- QWidget::show();
+ if(isHidden())
+ {
+ QWidget::show();
+ emit searchString(m_lineEdit->text());
+ }
+
m_hideTimer->start(60000);
- // emit a new find signal with the current text
- emit(searchString(m_lineEdit->text()));
-
// set focus to findbar if user select showFindBar shortcut
m_lineEdit->setFocus();
m_lineEdit->selectAll();