MarginWidget: Moved in leaveEvent

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 81973802b6cb1844eca489000aaa0ef3d7f18600..04e4c764845ce80c64ab6ac8bf9f0fb8ec935f58 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -252,12 +252,6 @@ void Header::mouseMoveEvent(QMouseEvent *event)
        update();
 }
 
-void Header::leaveEvent(QEvent*)
-{
-       mouse_point_ = QPoint(-1, -1);
-       update();
-}
-
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
        const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);

diff --git a/pv/view/header.hpp b/pv/view/header.hpp
index 62c29c16f93062420dd10957bad76d9fbdd27a5c..3c94f791c730d683b374cc4e16aafacbfa3ea1f2 100644 (file)
--- a/pv/view/header.hpp
+++ b/pv/view/header.hpp
@@ -76,8 +76,6 @@ private:
 
        void mouseMoveEvent(QMouseEvent *event);
 
-       void leaveEvent(QEvent *event);
-
        void contextMenuEvent(QContextMenuEvent *event);
 
        void keyPressEvent(QKeyEvent *e);

diff --git a/pv/view/marginwidget.cpp b/pv/view/marginwidget.cpp
index 6b646832690974b21d77720e858141afc9b3677f..b4b12140276c0b4faf11f9dab36a4d6a6ed7c117 100644 (file)
--- a/pv/view/marginwidget.cpp
+++ b/pv/view/marginwidget.cpp
@@ -46,6 +46,12 @@ void MarginWidget::show_popup(const shared_ptr<ViewItem> &item)
                p->show();
 }
 
+void MarginWidget::leaveEvent(QEvent*)
+{
+       mouse_point_ = QPoint(-1, -1);
+       update();
+}
+
 void MarginWidget::clear_selection()
 {
 }

diff --git a/pv/view/marginwidget.hpp b/pv/view/marginwidget.hpp
index a97b22c1012eb859a6c5de4efabc882ed4b49cf5..de5c866f3077fcc12acb8028167dc4de0711a69d 100644 (file)
--- a/pv/view/marginwidget.hpp
+++ b/pv/view/marginwidget.hpp
@@ -53,6 +53,9 @@ protected:
         */
        void show_popup(const std::shared_ptr<ViewItem> &item);
 
+private:
+       void leaveEvent(QEvent *event);
+
 public Q_SLOTS:
        virtual void clear_selection();
 

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 7fa9987504ca5ef370b7a8bb5bafcc6758dc5eb5..0c4dcb0bd13ed0c17cf47be2fa07cf737b051ded 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -209,12 +209,6 @@ void Ruler::mouseReleaseEvent(QMouseEvent *)
                i->drag_release();
 }
 
-void Ruler::leaveEvent(QEvent*)
-{
-       mouse_point_ = QPoint(-1, -1);
-       update();
-}
-
 void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
 {
        view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index 89b9ff4c801d22b009d30087fd4346d4db039689..5720c9a98ddc8df71cce279b662bd3da4bd07152 100644 (file)
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -70,7 +70,6 @@ private:
        void mouseMoveEvent(QMouseEvent *e);
        void mousePressEvent(QMouseEvent *e);
        void mouseReleaseEvent(QMouseEvent *);
-       void leaveEvent(QEvent*);
 
        void mouseDoubleClickEvent(QMouseEvent *e);