Changeset 8705 in vbox for trunk/src

Timestamp:

May 8, 2008 1:16:30 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30643

Message:

FE/Qt-OSX: Fixed a bug where the context menu event could be triggered twice.

Location:

trunk/src/VBox/Frontends

Files:

• VirtualBox/src/QIStateIndicator.cpp (modified) (1 diff)
• VirtualBox4/src/QIStateIndicator.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/QIStateIndicator.cpp

@@ -158 +158 @@
 void QIStateIndicator::mousePressEvent (QMouseEvent *aEv)
 {
-    QContextMenuEvent qme (QContextMenuEvent::Mouse, aEv->pos(), aEv->globalPos(), 0);
-    emit contextMenuRequested (this, &qme);
-    if (qme.isAccepted())
-        aEv->accept();
-    else
+    /* Do this for the left mouse button event only, cause in the case of the
+     * right mouse button it could happen that the context menu event is
+     * triggered twice. Also this isn't necessary for the middle mouse button
+     * which would be some kind of overstated. */
+    if (aEv->button() == Qt::LeftButton)
+    {
+        QContextMenuEvent qme (QContextMenuEvent::Mouse, aEv->pos(), aEv->globalPos(), 0);
+        emit contextMenuRequested (this, &qme);
+        if (qme.isAccepted())
+            aEv->accept();
+        else
+            QFrame::mousePressEvent (aEv);
+    }else
         QFrame::mousePressEvent (aEv);
 }

trunk/src/VBox/Frontends/VirtualBox4/src/QIStateIndicator.cpp

@@ -171 +171 @@
 void QIStateIndicator::mousePressEvent (QMouseEvent *aEv)
 {
-    QContextMenuEvent qme (QContextMenuEvent::Mouse, aEv->pos(), aEv->globalPos(), 0);
-    emit contextMenuRequested (this, &qme);
-    if (qme.isAccepted())
-        aEv->accept();
-    else
+    /* Do this for the left mouse button event only, cause in the case of the
+     * right mouse button it could happen that the context menu event is
+     * triggered twice. Also this isn't necessary for the middle mouse button
+     * which would be some kind of overstated. */
+    if (aEv->button() == Qt::LeftButton)
+    {
+        QContextMenuEvent qme (QContextMenuEvent::Mouse, aEv->pos(), aEv->globalPos(), 0);
+        emit contextMenuRequested (this, &qme);
+        if (qme.isAccepted())
+            aEv->accept();
+        else
+            QFrame::mousePressEvent (aEv);
+    }else
         QFrame::mousePressEvent (aEv);
 }