MarginWidget: Moved in contextMenuEvent

diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index b4b12140276c0b4faf11f9dab36a4d6a6ed7c117..8716439e6f74e294505489f148e8d3e31c7af7f1 100644 (file)
--- 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 b8bcdd77744f2e7676cdbb3a25d1eff9e321c852..4bd7ac18497991cc7cd8159eea9ca8a47b4339d7 100644 (file)
--- 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 9f8de32fd0df7686906ee6381bba581f4158340f..21dd16ff398cb4b03178c12353de0ee04a9207f4 100644 (file)
--- 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 e808b3097c665e4c33fbc14758d5ebf620438398..418d398295806ca927670c429f5a8c09ed3162f1 100644 (file)
--- 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: