Header: Make get_mouse_over_item return shared_ptr<ViewItem>

[pulseview.git] / pv / view / header.cpp

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 81973802b6cb1844eca489000aaa0ef3d7f18600..a2a7c505cfd420c5b6b66e3e6224795c7ecdabe9 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -80,7 +80,7 @@ QSize Header::extended_size_hint() const
        return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
        return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 

-shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
+shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)

 {
        const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)
 {
        const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)


@@ -174,7 +174,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
                QApplication::keyboardModifiers() & Qt::ControlModifier;
 
        // Unselect everything if control is not pressed
                QApplication::keyboardModifiers() & Qt::ControlModifier;
 
        // Unselect everything if control is not pressed

-       const shared_ptr<RowItem> mouse_over =
+       const shared_ptr<ViewItem> mouse_over =

                get_mouse_over_item(event->pos());
 
        for (auto &r : view_)
                get_mouse_over_item(event->pos());
 
        for (auto &r : view_)


@@ -252,15 +252,9 @@ void Header::mouseMoveEvent(QMouseEvent *event)
        update();
 }
 
        update();
 }
 

-void Header::leaveEvent(QEvent*)
-{
-       mouse_point_ = QPoint(-1, -1);
-       update();
-}
-

 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {

-       const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
+       const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);

        if (!r)
                return;
 
        if (!r)
                return;