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() &&
- (*i)->hit_box_rect(rect()).contains(pt))
+ (*i)->hit_box_rect(pp).contains(pt))
return *i;
return nullptr;
}
vector< shared_ptr<ViewItem> > Viewport::items()
{
- vector< shared_ptr<ViewItem> > items(view_.begin(), view_.end());
+ vector< shared_ptr<ViewItem> > items;
+ const std::vector< shared_ptr<ViewItem> > view_items(
+ view_.list_by_type<ViewItem>());
+ copy(view_items.begin(), view_items.end(), back_inserter(items));
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
copy(time_items.begin(), time_items.end(), back_inserter(items));
return items;
void Viewport::paintEvent(QPaintEvent*)
{
- vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+ vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
assert(none_of(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &r) { return !r; }));
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
- return a->visual_v_offset() < b->visual_v_offset(); });
+ return a->point(QRect()).y() < b->point(QRect()).y(); });
const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
assert(none_of(time_items.begin(), time_items.end(),