X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=5cb65079f1c98fe61242862404b15c908a6d3602;hp=1b3d371748b844255e0f5ef8b29b311d8130a538;hb=ac0708fb7e6b4010d90a569386810d3d2edc7eb9;hpb=cbf0f87e496c9d9157591c94dc445aaa960fe79d

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 1b3d3717..5cb65079 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -68,7 +68,7 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
 
 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
@@ -179,10 +179,10 @@ void Viewport::paintEvent(QPaintEvent*)
 	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);
+
+	p.setRenderHint(QPainter::Antialiasing, false);
 	for (const shared_ptr<TimeItem> t : time_items)
 		t->paint_fore(p, pp);
 
@@ -203,8 +203,7 @@ void Viewport::wheelEvent(QWheelEvent *e)
 {
 	assert(e);
 
-	if (e->orientation() == Qt::Vertical)
-	{
+	if (e->orientation() == Qt::Vertical) {
 		if (e->modifiers() & Qt::ControlModifier) {
 			// Vertical scrolling with the control key pressed
 			// is intrepretted as vertical scrolling
@@ -214,9 +213,7 @@ void Viewport::wheelEvent(QWheelEvent *e)
 			// Vertical scrolling is interpreted as zooming in/out
 			view_.zoom(e->delta() / 120, e->x());
 		}
-	}
-	else if (e->orientation() == Qt::Horizontal)
-	{
+	} else if (e->orientation() == Qt::Horizontal) {
 		// Horizontal scrolling is interpreted as moving left/right
 		view_.set_scale_offset(view_.scale(),
 			e->delta() * view_.scale() + view_.offset());