When hovering a ViewItem only change the mouse cursor for movable items.

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 91b27d3ffb02ab383c3d2c801507191610a072e6..3811c1e8a143d70b6dc8f03115d1ead1e529c07e 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -57,17 +57,18 @@ Viewport::Viewport(View &parent) :
 
 shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 {
 
 shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 {

+       const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());

        const vector< shared_ptr<ViewItem> > items(this->items());
        for (auto i = items.rbegin(); i != items.rend(); i++)
                if ((*i)->enabled() &&
        const vector< shared_ptr<ViewItem> > items(this->items());
        for (auto i = items.rbegin(); i != items.rend(); i++)
                if ((*i)->enabled() &&

-                       (*i)->hit_box_rect(rect()).contains(pt))
+                       (*i)->hit_box_rect(pp).contains(pt))

                        return *i;
        return nullptr;
 }
 
 void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 {
                        return *i;
        return nullptr;
 }
 
 void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 {

-       if (item)
+       if (item && item->is_draggable())

                setCursor(dynamic_pointer_cast<RowItem>(item) ?
                        Qt::SizeVerCursor : Qt::SizeHorCursor);
        else
                setCursor(dynamic_pointer_cast<RowItem>(item) ?
                        Qt::SizeVerCursor : Qt::SizeHorCursor);
        else


@@ -178,10 +179,10 @@ void Viewport::paintEvent(QPaintEvent*)
        for (const shared_ptr<RowItem> r : row_items)
                r->paint_mid(p, pp);
 
        for (const shared_ptr<RowItem> r : row_items)
                r->paint_mid(p, pp);
 

-       p.setRenderHint(QPainter::Antialiasing, false);
-

        for (const shared_ptr<RowItem> r : row_items)
                r->paint_fore(p, pp);
        for (const shared_ptr<RowItem> r : row_items)
                r->paint_fore(p, pp);

+
+       p.setRenderHint(QPainter::Antialiasing, false);

        for (const shared_ptr<TimeItem> t : time_items)
                t->paint_fore(p, pp);
 
        for (const shared_ptr<TimeItem> t : time_items)
                t->paint_fore(p, pp);