From c265c4a38887b65243ec6c9537c9cc7b5b53df40 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 14 Aug 2010 19:35:42 +0200
Subject: Fixed focus regression. As show slot calls setVisible(true) in
 QWidget code, we cannot override show() AND setVisible(bool). The best thing
 is IMHO inheriting show() && hide() slots

---
 src/findbar.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/findbar.cpp')

diff --git a/src/findbar.cpp b/src/findbar.cpp
index 495e4f96..b3b80fac 100644
--- a/src/findbar.cpp
+++ b/src/findbar.cpp
@@ -144,6 +144,7 @@ void FindBar::show()
     // show findbar if not visible
     if (isHidden())
     {
+        emit visibilityChanged(true);
         QWidget::show();
         emit searchString(m_lineEdit->text());
     }
@@ -183,19 +184,13 @@ void FindBar::notifyMatch(bool match)
 void FindBar::hide()
 {
     m_hideTimer->stop();
+    emit visibilityChanged(false);
     QWidget::hide();
     emit(searchString(m_lineEdit->text()));
 }
 
 
-void FindBar::setVisible(bool visible)
-{
-    emit visibilityChanged(visible);
-    QWidget::setVisible(visible);
-}
-
-
 void FindBar::toggleVisibility()
 {
-    setVisible(!isVisible());
+    isVisible() ? hide() : show();
 }
-- 
cgit v1.2.1