MarginWidget: Moved mouse_down_item_ in

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index c19d10883af7fed3c77e3ee60d0f497faadb2958..81973802b6cb1844eca489000aaa0ef3d7f18600 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -96,19 +96,6 @@ void Header::clear_selection()
        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
@@ -247,11 +234,11 @@ void Header::mouseMoveEvent(QMouseEvent *event)
        // Do the drag
        dragging_ = true;
 
-       const int delta = event->pos().y() - mouse_down_point_.y();
+       const QPoint delta = event->pos() - mouse_down_point_;
 
        for (std::shared_ptr<RowItem> r : view_)
                if (r->dragging()) {
-                       r->force_to_v_offset(r->drag_point().y() + delta);
+                       r->drag_by(delta);
 
                        // Ensure the trace is selected
                        r->select();
@@ -327,8 +314,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());