Viewport::Viewport(View &parent) :
ViewWidget(parent),
- drag_offset_(numeric_limits<double>::signaling_NaN()),
pinch_zoom_active_(false)
{
setAutoFillBackground(true);
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;
}
void Viewport::drag_by(const QPoint &delta)
{
- // Use std::isnan() instead of isnan(), the latter can cause issues.
- if (std::isnan(drag_offset_))
+ if (drag_offset_ == boost::none)
return;
- view_.set_scale_offset(view_.scale(), drag_offset_ -
- delta.x() * view_.scale());
+ view_.set_scale_offset(view_.scale(),
+ (*drag_offset_ - delta.x() * view_.scale()));
}
void Viewport::drag_release()
{
- drag_offset_ = numeric_limits<double>::signaling_NaN();
+ drag_offset_ = boost::none;
}
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;
if (!pinch_zoom_active_ ||
(event->touchPointStates() & Qt::TouchPointPressed)) {
- pinch_offset0_ = view_.offset() + view_.scale() * touchPoint0.pos().x();
- pinch_offset1_ = view_.offset() + view_.scale() * touchPoint1.pos().x();
+ pinch_offset0_ = (view_.offset() + view_.scale() * touchPoint0.pos().x()).convert_to<double>();
+ pinch_offset1_ = (view_.offset() + view_.scale() * touchPoint1.pos().x()).convert_to<double>();
pinch_zoom_active_ = true;
}
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(),
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);