From c99b656279ad92eee936c7147c47a58b513b4a7e Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Sun, 15 Sep 2019 15:57:12 -0400
Subject: [PATCH] Always show search menu when icon clicked

* Search menu icon only allowed the search menu to show when the right third of the icon was clicked, this was a Qt limitation.
* Fixes #3538
---
 src/gui/SearchWidget.cpp | 15 ++++++++++-----
 src/gui/SearchWidget.h   |  2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/gui/SearchWidget.cpp b/src/gui/SearchWidget.cpp
index 8d33998cc..bfb7e197e 100644
--- a/src/gui/SearchWidget.cpp
+++ b/src/gui/SearchWidget.cpp
@@ -48,7 +48,8 @@ SearchWidget::SearchWidget(QWidget* parent)
     connect(m_ui->searchEdit, SIGNAL(textChanged(QString)), SLOT(startSearchTimer()));
     connect(m_ui->clearIcon, SIGNAL(triggered(bool)), m_ui->searchEdit, SLOT(clear()));
     connect(m_ui->helpIcon, SIGNAL(triggered()), SLOT(toggleHelp()));
-    connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(startSearch()));
+    connect(m_ui->searchIcon, SIGNAL(triggered()), SLOT(showSearchMenu()));
+    connect(m_searchTimer, SIGNAL(timeout()), SLOT(startSearch()));
     connect(m_clearSearchTimer, SIGNAL(timeout()), m_ui->searchEdit, SLOT(clear()));
     connect(this, SIGNAL(escapePressed()), m_ui->searchEdit, SLOT(clear()));
 
@@ -59,18 +60,17 @@ SearchWidget::SearchWidget(QWidget* parent)
                                              .arg(QKeySequence(QKeySequence::Find).toString(QKeySequence::NativeText)));
     m_ui->searchEdit->installEventFilter(this);
 
-    QMenu* searchMenu = new QMenu();
-    m_actionCaseSensitive = searchMenu->addAction(tr("Case sensitive"), this, SLOT(updateCaseSensitive()));
+    m_searchMenu = new QMenu();
+    m_actionCaseSensitive = m_searchMenu->addAction(tr("Case sensitive"), this, SLOT(updateCaseSensitive()));
     m_actionCaseSensitive->setObjectName("actionSearchCaseSensitive");
     m_actionCaseSensitive->setCheckable(true);
 
-    m_actionLimitGroup = searchMenu->addAction(tr("Limit search to selected group"), this, SLOT(updateLimitGroup()));
+    m_actionLimitGroup = m_searchMenu->addAction(tr("Limit search to selected group"), this, SLOT(updateLimitGroup()));
     m_actionLimitGroup->setObjectName("actionSearchLimitGroup");
     m_actionLimitGroup->setCheckable(true);
     m_actionLimitGroup->setChecked(config()->get("SearchLimitGroup", false).toBool());
 
     m_ui->searchIcon->setIcon(filePath()->icon("actions", "system-search"));
-    m_ui->searchIcon->setMenu(searchMenu);
     m_ui->searchEdit->addAction(m_ui->searchIcon, QLineEdit::LeadingPosition);
 
     m_ui->helpIcon->setIcon(filePath()->icon("actions", "system-help"));
@@ -214,3 +214,8 @@ void SearchWidget::toggleHelp()
         m_helpWidget->show();
     }
 }
+
+void SearchWidget::showSearchMenu()
+{
+    m_searchMenu->exec(m_ui->searchEdit->mapToGlobal(m_ui->searchEdit->rect().bottomLeft()));
+}
diff --git a/src/gui/SearchWidget.h b/src/gui/SearchWidget.h
index 43dd76430..f3646c362 100644
--- a/src/gui/SearchWidget.h
+++ b/src/gui/SearchWidget.h
@@ -69,6 +69,7 @@ private slots:
     void updateLimitGroup();
     void searchFocus();
     void toggleHelp();
+    void showSearchMenu();
 
 private:
     const QScopedPointer<Ui::SearchWidget> m_ui;
@@ -77,6 +78,7 @@ private:
     QTimer* m_clearSearchTimer;
     QAction* m_actionCaseSensitive;
     QAction* m_actionLimitGroup;
+    QMenu* m_searchMenu;
 };
 
 #endif // SEARCHWIDGET_H