From 4f3c3cdcc4d0cc04e88202b46da031e95e22c15d Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 27 Aug 2012 16:01:22 +0200
Subject: [PATCH] Fixed navigation keys not working right after closing search
 bar - keys PageUp, PageDown, Space and arrows

closes #530
---
 CHANGELOG                         | 2 ++
 src/lib/history/history.cpp       | 2 +-
 src/lib/webview/searchtoolbar.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 041959916..c1bbfd359 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,11 +11,13 @@ Version 1.3.5
     * Save x as ... actions will always show file dialog
     * possibility to choose to use external download manager on every download
     * remember last section in preferences
+    * much more tabs now fits into tabbar without overflowing into tab buttons
     * smarter address bar completer will show better search results
     * new User Agent manager lets you set User Agent per site
     * new restore session page lets you choose which tabs you want to restore
     * new scheme handler for file protocol allows browsing through directories
     * new option to show loading progress in address bar
+    * new option to hide close button on tabs
     * fixed visibility of navigation bar in fullscreen
     * fixed bad position of add tab button when there is a lot of tabs
     * fixed gui with RTL languages
diff --git a/src/lib/history/history.cpp b/src/lib/history/history.cpp
index 325593fe2..4ea7cbba2 100644
--- a/src/lib/history/history.cpp
+++ b/src/lib/history/history.cpp
@@ -71,7 +71,7 @@ void History::addHistoryEntry(const QUrl &url, QString title)
     if (url.scheme() == "qupzilla" || url.scheme() == "about" || url.isEmpty()) {
         return;
     }
-    if (title == "") {
+    if (title.isEmpty()) {
         title = tr("No Named Page");
     }
 
diff --git a/src/lib/webview/searchtoolbar.cpp b/src/lib/webview/searchtoolbar.cpp
index d7829cc6f..fb1b2039c 100644
--- a/src/lib/webview/searchtoolbar.cpp
+++ b/src/lib/webview/searchtoolbar.cpp
@@ -62,10 +62,10 @@ void SearchToolBar::focusSearchLine()
 
 void SearchToolBar::hide()
 {
-    searchText("");
-    p_QupZilla->weView()->setFocus();
-
     AnimatedWidget::hide();
+
+    searchText(QString());
+    p_QupZilla->weView()->setFocus();
 }
 
 void SearchToolBar::findNext()
@@ -102,7 +102,7 @@ void SearchToolBar::highlightChanged()
         view->findText(ui->lineEdit->text(), m_findFlags | QWebPage::HighlightAllOccurrences);
     }
     else {
-        view->findText("", QWebPage::HighlightAllOccurrences);
+        view->findText(QString(), QWebPage::HighlightAllOccurrences);
     }
 }