From fd6e126038cf8fb8b4e30d02bead1238eaa63115 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Thu, 3 Sep 2020 23:54:58 +0200
Subject: [PATCH] WIP: some refinement of help dialog search function.

---
 src/laybasic/laybasic/BrowserPanel.ui    | 4 ++--
 src/laybasic/laybasic/layBrowserPanel.cc | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/laybasic/laybasic/BrowserPanel.ui b/src/laybasic/laybasic/BrowserPanel.ui
index ac0144c39..38a767f04 100644
--- a/src/laybasic/laybasic/BrowserPanel.ui
+++ b/src/laybasic/laybasic/BrowserPanel.ui
@@ -253,7 +253,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QToolButton" name="toolButton">
+              <widget class="QToolButton" name="search_close_button">
                <property name="text">
                 <string>...</string>
                </property>
@@ -462,7 +462,7 @@
  </resources>
  <connections>
   <connection>
-   <sender>toolButton</sender>
+   <sender>search_close_button</sender>
    <signal>clicked()</signal>
    <receiver>search_frame</receiver>
    <slot>hide()</slot>
diff --git a/src/laybasic/laybasic/layBrowserPanel.cc b/src/laybasic/laybasic/layBrowserPanel.cc
index 22d1fa529..243227a89 100644
--- a/src/laybasic/laybasic/layBrowserPanel.cc
+++ b/src/laybasic/laybasic/layBrowserPanel.cc
@@ -92,6 +92,7 @@ BrowserPanel::init ()
   connect (mp_ui->outline_tree, SIGNAL (itemActivated (QTreeWidgetItem *, int)), this, SLOT (outline_item_clicked (QTreeWidgetItem *)));
   connect (mp_ui->action_find, SIGNAL (triggered ()), this, SLOT (find ()));
   connect (mp_ui->on_page_search_edit, SIGNAL (textChanged (const QString &)), this, SLOT (page_search_edited ()));
+  connect (mp_ui->search_close_button, SIGNAL (clicked ()), this, SLOT (page_search_edited ()), Qt::QueuedConnection);
   connect (mp_ui->on_page_search_edit, SIGNAL (returnPressed ()), this, SLOT (page_search_next ()));
   connect (mp_ui->on_page_search_next, SIGNAL (clicked ()), this, SLOT (page_search_next ()));
 
@@ -143,7 +144,7 @@ BrowserPanel::page_search_edited ()
   m_search_selection.clear ();
   m_search_index = -1;
 
-  if (mp_ui->on_page_search_edit->text ().size () < 2) {
+  if (! mp_ui->search_frame->isVisible () || mp_ui->on_page_search_edit->text ().size () < 2) {
     mp_ui->browser->setExtraSelections (m_search_selection);
     return;
   }
@@ -219,6 +220,9 @@ BrowserPanel::text_changed ()
     m_current_title = title;
     emit title_changed (title);
   }
+
+  //  refresh on-page search
+  page_search_edited ();
 }
 
 void