Mercurial > hg > easyhg

changeset 475:dec4695f64e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Tue, 26 Jul 2011 13:42:09 +0100
parents 8bdc8f27d19c (diff) 101d113943c2 (current diff)
children 7e8688784980
files
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/changesetitem.cpp	Fri Jul 22 12:00:29 2011 +0100
+++ b/src/changesetitem.cpp	Tue Jul 26 13:42:09 2011 +0100
@@ -101,17 +101,16 @@
         } else {
             showDetail();
         }
-    } else if (e->button() == Qt::RightButton) {
-        if (m_detail) {
-            hideDetail();
-        }
-        activateMenu();
     }
 }
 
 void
-ChangesetItem::activateMenu()
+ChangesetItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *)
 {
+    if (m_detail) {
+        hideDetail();
+    }
+
     m_parentDiffActions.clear();
     m_summaryActions.clear();
 
@@ -201,9 +200,9 @@
     QAction *tag = menu->addAction(tr("Add tag..."));
     connect(tag, SIGNAL(triggered()), this, SLOT(tagActivated()));
 
+    ungrabMouse();
+
     menu->exec(QCursor::pos());
-
-    ungrabMouse();
 }
 
 void
--- a/src/changesetitem.h	Fri Jul 22 12:00:29 2011 +0100
+++ b/src/changesetitem.h	Tue Jul 26 13:42:09 2011 +0100
@@ -85,6 +85,7 @@
 
 protected:
     virtual void mousePressEvent(QGraphicsSceneMouseEvent *);
+    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *);
 
 private:
     void activateMenu();