[Seq-cvs-commit] SF.net SVN: seq:[1305] showeq/branches/cn187_devel/src

[<cn...@us...>]

Revision: 1305
          http://sourceforge.net/p/seq/svn/1305
Author:   cn187
Date:     2022-11-29 23:34:33 +0000 (Tue, 29 Nov 2022)
Log Message:
-----------
Don't show Qt5 build-in context menu on top of our own menus

Modified Paths:
--------------
    showeq/branches/cn187_devel/src/interface.cpp
    showeq/branches/cn187_devel/src/interface.h
    showeq/branches/cn187_devel/src/seqwindow.cpp

Modified: showeq/branches/cn187_devel/src/interface.cpp
===================================================================
--- showeq/branches/cn187_devel/src/interface.cpp	2022-11-29 23:34:25 UTC (rev 1304)
+++ showeq/branches/cn187_devel/src/interface.cpp	2022-11-29 23:34:33 UTC (rev 1305)
@@ -6453,6 +6453,11 @@
       dw->setAllowedAreas(Qt::NoDockWidgetArea);
 }
 
+void EQInterface::contextMenuEvent(QContextMenuEvent* event)
+{
+    event->ignore();
+}
+
 #ifndef QMAKEBUILD
 #include "interface.moc"
 #endif

Modified: showeq/branches/cn187_devel/src/interface.h
===================================================================
--- showeq/branches/cn187_devel/src/interface.h	2022-11-29 23:34:25 UTC (rev 1304)
+++ showeq/branches/cn187_devel/src/interface.h	2022-11-29 23:34:33 UTC (rev 1305)
@@ -347,6 +347,8 @@
    QStringList enumerateDevices();
    QString promptForNetDevice();
 
+   virtual void contextMenuEvent(QContextMenuEvent* event) override;
+
  public:
    Player* m_player;
    MapMgr* mapMgr(void) { return m_mapMgr; }

Modified: showeq/branches/cn187_devel/src/seqwindow.cpp
===================================================================
--- showeq/branches/cn187_devel/src/seqwindow.cpp	2022-11-29 23:34:25 UTC (rev 1304)
+++ showeq/branches/cn187_devel/src/seqwindow.cpp	2022-11-29 23:34:33 UTC (rev 1305)
@@ -104,9 +104,14 @@
   {
     QMenu* popupMenu = menu();
     if (popupMenu)
+    {
       popupMenu->popup(mapToGlobal(e->pos()));
+      e->accept();
+    }
     else
+    {
       QDockWidget::mousePressEvent(e);
+    }
   }
   else
     QDockWidget::mousePressEvent(e);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.