feat: trigger the highlisters menu without closing(variar#551)

src/ui/CMakeLists.txt

@@ -17,7 +17,7 @@ add_library(
   ${CMAKE_CURRENT_SOURCE_DIR}/include/logmainview.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/mainwindow.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/mainwindowtext.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/menuactiontooltipbehavior.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/menu.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/optionsdialog.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/overview.h
   ${CMAKE_CURRENT_SOURCE_DIR}/include/overviewwidget.h
@@ -66,7 +66,7 @@ add_library(
   ${CMAKE_CURRENT_SOURCE_DIR}/src/logmainview.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/mainwindow.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/mainwindowtext.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/menuactiontooltipbehavior.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/menu.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/optionsdialog.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/overview.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/src/overviewwidget.cpp

src/ui/include/mainwindow.h

@@ -40,6 +40,7 @@
 #define MAINWINDOW_H
 
 #include <QMainWindow>
+#include <QMenu>
 #include <QSystemTrayIcon>
 #include <QTemporaryDir>
 

src/ui/include/menuactiontooltipbehavior.h → src/ui/include/menu.h

@@ -17,45 +17,61 @@
  * along with glogg.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MANUACTIONTOOLTIPBEHAVIOR_H
-#define MANUACTIONTOOLTIPBEHAVIOR_H
+#ifndef KLOGG_MENU_H
+#define KLOGG_MENU_H
 
+#include <QMenu>
 #include <QObject>
 #include <QPoint>
 
 class QAction;
 class QMenu;
 class QTimerEvent;
-
+class QPoint;
 
 // Provides a behavior to show an action's tooltip after mouse is unmoved for
 // a specified number of 'ms'. E.g. used for tooltips with full-path for recent
 // files in the file menu. Not thread-safe.
-class MenuActionToolTipBehavior : public QObject
-{
+class MenuActionToolTipBehavior : public QObject {
     Q_OBJECT
 
- public:
-    MenuActionToolTipBehavior(QAction *menuAction, QMenu *menuParent,
-                              QObject *parent);
+  public:
+    MenuActionToolTipBehavior( QAction* menuAction, QMenu* menuParent, QObject* parent );
 
     // Time in ms that mouse needs to stay unmoved for tooltip to be shown
     int toolTipDelay(); /* ms */
-    void setToolTipDelay(int ms);
+    void setToolTipDelay( int ms );
 
- private:
-    void timerEvent(QTimerEvent *event) override;
-    void showToolTip(const QPoint &position);
+  private:
+    void timerEvent( QTimerEvent* event ) override;
+    void showToolTip( const QPoint& position );
 
- private Q_SLOTS:
+  private Q_SLOTS:
     void onActionHovered();
 
- private:
-    QAction *action;
-    QMenu *parentMenu;
+  private:
+    QAction* action;
+    QMenu* parentMenu;
     int toolTipDelayMs;
     int timerId;
     QPoint hoverPoint;
 };
 
-#endif
+class HoverMenu : public QMenu {
+  public:
+    explicit HoverMenu( const QString& title, QWidget* parent = nullptr );
+
+    void mouseMoveEvent( QMouseEvent* ) override;
+    void mouseReleaseEvent( QMouseEvent* ) override;
+
+  private:
+    inline bool mouseInMenu( const QPoint& pos )
+    {
+        return this->rect().contains( pos );
+    }
+
+  private:
+    bool mouseInMenu_;
+};
+
+#endif // KLOGG_MENU_H

src/ui/src/mainwindow.cpp

@@ -94,6 +94,7 @@
 #include "klogg_version.h"
 #include "logger.h"
 #include "mainwindowtext.h"
+#include "menu.h"
 #include "openfilehelper.h"
 #include "optionsdialog.h"
 #include "predefinedfiltersdialog.h"
@@ -790,7 +791,8 @@ void MainWindow::createMenus()
 
     toolsMenu = menuBar()->addMenu( tr( menu::toolsTitle ) );
 
-    highlightersMenu = menuBar()->addMenu( tr( menu::highlightersTitle ) );
+    highlightersMenu = new HoverMenu( tr( menu::highlightersTitle ), menuBar() );
+    menuBar()->addMenu( highlightersMenu );
     connect( highlightersMenu, &QMenu::aboutToShow,
              [ this ]() { setCurrentHighlighterAction( highlightersActionGroup ); } );
 

src/ui/src/menuactiontooltipbehavior.cpp → src/ui/src/menu.cpp

@@ -19,11 +19,13 @@
 
 #include <QAction>
 #include <QMenu>
+#include <QMouseEvent>
+#include <QRect>
 #include <QTimerEvent>
 #include <QToolTip>
 
 #include "active_screen.h"
-#include "menuactiontooltipbehavior.h"
+#include "menu.h"
 
 // It would be nice to only need action, and have action be the parent,
 // however implementation needs the parent menu (see showToolTip), and
@@ -108,3 +110,35 @@ void MenuActionToolTipBehavior::showToolTip( const QPoint& position )
     QRect activeRegion( relativePos.x(), relativePos.y(), 1, 1 );
     QToolTip::showText( position, toolTip, parentMenu, activeRegion );
 }
+
+HoverMenu::HoverMenu( const QString& title, QWidget* parent )
+    : QMenu( title, parent )
+    , mouseInMenu_{ false }
+{
+}
+
+void HoverMenu::mouseMoveEvent( QMouseEvent* ev )
+{
+    auto nowMousePosition = mouseInMenu( ev->pos() );
+
+    // hide the menu list if the mouse leaves the menu.
+    if ( mouseInMenu_ && !nowMousePosition ) {
+        this->hide();
+    }
+    mouseInMenu_ = nowMousePosition;
+
+    QMenu::mouseMoveEvent( ev );
+}
+
+void HoverMenu::mouseReleaseEvent( QMouseEvent* ev )
+{
+    auto* action = this->actionAt( ev->pos() );
+
+    // responds to left-click event only
+    if ( action != nullptr && ev->button() == Qt::LeftButton ) {
+        action->activate( QAction::ActionEvent::Trigger );
+    }
+    else {
+        QMenu::mouseReleaseEvent( ev );
+    }
+}