From: Joel Holdsworth <redacted>
Date: Sun, 21 Dec 2014 13:01:18 +0000 (+0000)
Subject: MarginWidget: Moved in contextMenuEvent
X-Git-Tag: pulseview-0.3.0~312
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=2155b66bed9f0802caec0b1e86f7f03d317a3e83

MarginWidget: Moved in contextMenuEvent
---

diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index b4b12140..8716439e 100644
--- a/pv/view/marginwidget.cpp
+++ b/pv/view/marginwidget.cpp
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <QMenu>
+#include <QMouseEvent>
+
 #include "view.hpp"
 
 #include "marginwidget.hpp"
@@ -52,6 +55,17 @@ void MarginWidget::leaveEvent(QEvent*)
 	update();
 }
 
+void MarginWidget::contextMenuEvent(QContextMenuEvent *event)
+{
+	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
+	if (!r)
+		return;
+
+	QMenu *menu = r->create_context_menu(this);
+	if (menu)
+		menu->exec(event->globalPos());
+}
+
 void MarginWidget::clear_selection()
 {
 }
diff --git a/pv/view/marginwidget.hpp b/pv/view/marginwidget.hpp
index b8bcdd77..4bd7ac18 100644
--- a/pv/view/marginwidget.hpp
+++ b/pv/view/marginwidget.hpp
@@ -70,6 +70,8 @@ protected:
 private:
 	void leaveEvent(QEvent *event);
 
+	virtual void contextMenuEvent(QContextMenuEvent *event);
+
 public Q_SLOTS:
 	virtual void clear_selection();
 
diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 9f8de32f..21dd16ff 100644
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,7 +22,6 @@
 
 #include <QApplication>
 #include <QFontMetrics>
-#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
@@ -221,17 +220,6 @@ void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 	view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
 }
 
-void Ruler::contextMenuEvent(QContextMenuEvent *event)
-{
-	const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
-	if (!r)
-		return;
-
-	QMenu *menu = r->create_context_menu(this);
-	if (menu)
-		menu->exec(event->globalPos());
-}
-
 void Ruler::keyPressEvent(QKeyEvent *e)
 {
 	assert(e);
diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index e808b309..418d3982 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -85,8 +85,6 @@ private:
 
 	void mouseDoubleClickEvent(QMouseEvent *e);
 
-	void contextMenuEvent(QContextMenuEvent *event);
-
 	void keyPressEvent(QKeyEvent *e);
 
 private: