MarginWidget: Moved in clear_selection

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 77ac1aa88c343498bfcaf57939b4f0995862b54a..1cbe59cec4133711f9287d8c55de7a5caba1335d 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -80,7 +80,12 @@ QSize Header::extended_size_hint() const
        return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
 }
 
-shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
+vector< shared_ptr<ViewItem> > Header::items()
+{
+       return vector< shared_ptr<ViewItem> >(view_.begin(), view_.end());
+}
+
+shared_ptr<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 {
        const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)
@@ -89,26 +94,6 @@ shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
        return shared_ptr<RowItem>();
 }
 
-void Header::clear_selection()
-{
-       for (auto &i : view_)
-               i->select(false);
-       update();
-}
-
-void Header::show_popup(const shared_ptr<RowItem> &item)
-{
-       using pv::widgets::Popup;
-
-       Popup *const p = item->create_popup(&view_);
-       if (!p)
-               return;
-
-       const QPoint pt(width() - BaselineOffset, item->get_visual_y());
-       p->set_position(mapToGlobal(pt), Popup::Right);
-       p->show();
-}
-
 void Header::paintEvent(QPaintEvent*)
 {
        // The trace labels are not drawn with the arrows exactly on the
@@ -187,7 +172,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
                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_)
@@ -265,15 +250,9 @@ 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_);
+       const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
        if (!r)
                return;
 
@@ -327,8 +306,10 @@ void Header::on_group()
                        return a->visual_v_offset() < b->visual_v_offset(); });
 
        shared_ptr<TraceGroup> group(new TraceGroup());
+       shared_ptr<RowItem> mouse_down_item(
+               std::dynamic_pointer_cast<RowItem>(mouse_down_item_));
        shared_ptr<RowItem> focus_item(
-               mouse_down_item_ ? mouse_down_item_ : selected_items.front());
+               mouse_down_item ? mouse_down_item : selected_items.front());
 
        assert(focus_item);
        assert(focus_item->owner());