X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fviewport.cpp;h=0c73ec494adfbc72257252c59ead85d609a6ad24;hb=440bdf504a05efe589e8954ad28be62ba2c2d325;hp=8eb32a5e94f03d11254a87e7eae5b14f714c4810;hpb=20f59e957e70250cfb876ac7a1743134d6b83339;p=pulseview.git

diff --git a/pv/views/trace/viewport.cpp b/pv/views/trace/viewport.cpp
index 8eb32a5e..0c73ec49 100644
--- a/pv/views/trace/viewport.cpp
+++ b/pv/views/trace/viewport.cpp
@@ -30,6 +30,8 @@
 #include <pv/session.hpp>
 
 #include <QMouseEvent>
+#include <QScreen>
+#include <QWindow>
 
 #include <QDebug>
 
@@ -64,11 +66,11 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 	return nullptr;
 }
 
-void Viewport::item_hover(const shared_ptr<ViewItem> &item)
+void Viewport::item_hover(const shared_ptr<ViewItem> &item, QPoint pos)
 {
-	if (item && item->is_draggable())
-		setCursor(dynamic_pointer_cast<RowItem>(item) ?
-			Qt::SizeVerCursor : Qt::SizeHorCursor);
+	if (item && item->is_draggable(pos))
+		setCursor(dynamic_pointer_cast<ViewItem>(item) ?
+			Qt::SizeHorCursor : Qt::SizeVerCursor);
 	else
 		unsetCursor();
 }
@@ -114,6 +116,9 @@ bool Viewport::touch_event(QTouchEvent *event)
 		pinch_zoom_active_ = false;
 		return false;
 	}
+	if (event->device()->type() == QTouchDevice::TouchPad) {
+		return false;
+	}
 
 	const QTouchEvent::TouchPoint &touchPoint0 = touchPoints.first();
 	const QTouchEvent::TouchPoint &touchPoint1 = touchPoints.last();
@@ -159,29 +164,33 @@ void Viewport::paintEvent(QPaintEvent*)
 		&ViewItem::paint_back, &ViewItem::paint_mid,
 		&ViewItem::paint_fore, nullptr};
 
-	vector< shared_ptr<RowItem> > row_items(view_.list_by_type<RowItem>());
+	vector< shared_ptr<ViewItem> > row_items(view_.list_by_type<ViewItem>());
 	assert(none_of(row_items.begin(), row_items.end(),
-		[](const shared_ptr<RowItem> &r) { return !r; }));
+		[](const shared_ptr<ViewItem> &r) { return !r; }));
 
 	stable_sort(row_items.begin(), row_items.end(),
-		[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
-			return a->point(QRect()).y() < b->point(QRect()).y(); });
+		[](const shared_ptr<ViewItem> &a, const shared_ptr<ViewItem> &b) {
+			return a->drag_point(QRect()).y() < b->drag_point(QRect()).y(); });
 
 	const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
 	assert(none_of(time_items.begin(), time_items.end(),
 		[](const shared_ptr<TimeItem> &t) { return !t; }));
 
 	QPainter p(this);
-	p.setRenderHint(QPainter::Antialiasing);
+
+	// Disable antialiasing for high-DPI displays
+	bool use_antialiasing =
+		window()->windowHandle()->screen()->devicePixelRatio() < 2.0;
+	p.setRenderHint(QPainter::Antialiasing, use_antialiasing);
 
 	for (LayerPaintFunc *paint_func = layer_paint_funcs;
 			*paint_func; paint_func++) {
 		ViewItemPaintParams time_pp(rect(), view_.scale(), view_.offset());
-		for (const shared_ptr<TimeItem> t : time_items)
+		for (const shared_ptr<TimeItem>& t : time_items)
 			(t.get()->*(*paint_func))(p, time_pp);
 
 		ViewItemPaintParams row_pp(rect(), view_.scale(), view_.offset());
-		for (const shared_ptr<RowItem> r : row_items)
+		for (const shared_ptr<ViewItem>& r : row_items)
 			(r.get()->*(*paint_func))(p, row_pp);
 	}