MarginWidget: Moved in create_popup

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 780b1e3db5f9894c39e845fd6a549e855976038a..41dffca1f92323c9ece2090893aea04e90afd30f 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -62,9 +62,6 @@ static bool item_selected(shared_ptr<RowItem> r)
 Header::Header(View &parent) :
        MarginWidget(parent)
 {
-       setFocusPolicy(Qt::ClickFocus);
-       setMouseTracking(true);
-
        connect(&view_, SIGNAL(signals_moved()),
                this, SLOT(on_signals_moved()));
 }
@@ -78,7 +75,12 @@ QSize Header::sizeHint() const
        return QSize(max_rect.width() + Padding + BaselineOffset, 0);
 }
 
-shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
+QSize Header::extended_size_hint() const
+{
+       return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
+}
+
+shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
 {
        const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)
@@ -94,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
@@ -171,7 +160,7 @@ void Header::mousePressEvent(QMouseEvent *event)
        assert(event);
 
        mouse_down_point_ = event->pos();
-       mouse_down_item_ = get_mouse_over_row_item(event->pos());
+       mouse_down_item_ = get_mouse_over_item(event->pos());
 
        if (event->button() & Qt::LeftButton)
                mouseLeftPressEvent(event);
@@ -186,7 +175,7 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
 
        // Unselect everything if control is not pressed
        const shared_ptr<RowItem> mouse_over =
-               get_mouse_over_row_item(event->pos());
+               get_mouse_over_item(event->pos());
 
        for (auto &r : view_)
                r->drag_release();
@@ -245,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();
@@ -271,7 +260,7 @@ void Header::leaveEvent(QEvent*)
 
 void Header::contextMenuEvent(QContextMenuEvent *event)
 {
-       const shared_ptr<RowItem> r = get_mouse_over_row_item(mouse_point_);
+       const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
        if (!r)
                return;