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 837d1916c72a69f10e8e460cbc2296c2cc88408d..a2a7c505cfd420c5b6b66e3e6224795c7ecdabe9 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,9 +75,14 @@ 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<ViewItem> Header::get_mouse_over_item(const QPoint &pt)
 {
-       const QRect r(BaselineOffset, 0, width() - BaselineOffset, height());
+       const QRect r(0, 0, width() - BaselineOffset, height());
        for (auto &i : view_)
                if (i->enabled() && i->label_rect(r).contains(pt))
                        return i;
@@ -94,25 +96,12 @@ 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
        // left edge of the widget, because then the selection shadow
        // would be clipped away.
-       const QRect rect(BaselineOffset, 0, width() - BaselineOffset, height());
+       const QRect rect(0, 0, width() - BaselineOffset, height());
 
        vector< shared_ptr<RowItem> > row_items(
                view_.begin(), view_.end());
@@ -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);
@@ -185,8 +174,8 @@ void Header::mouseLeftReleaseEvent(QMouseEvent *event)
                QApplication::keyboardModifiers() & Qt::ControlModifier;
 
        // Unselect everything if control is not pressed
-       const shared_ptr<RowItem> mouse_over =
-               get_mouse_over_row_item(event->pos());
+       const shared_ptr<ViewItem> mouse_over =
+               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();
@@ -263,15 +252,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_row_item(mouse_point_);
+       const shared_ptr<ViewItem> r = get_mouse_over_item(mouse_point_);
        if (!r)
                return;
 
@@ -325,8 +308,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());