Make sure get_time_extents() uses a signal that data was acquired for

[pulseview.git] / pv / views / trace / viewport.cpp

diff --git a/pv/views/trace/viewport.cpp b/pv/views/trace/viewport.cpp
index 6c51d0a1f4a4c44f4964421000edd7cc16aad9a7..0c73ec494adfbc72257252c59ead85d609a6ad24 100644 (file)
--- a/pv/views/trace/viewport.cpp
+++ b/pv/views/trace/viewport.cpp
@@ -70,7 +70,7 @@ void Viewport::item_hover(const shared_ptr<ViewItem> &item, QPoint pos)
 {
        if (item && item->is_draggable(pos))
                setCursor(dynamic_pointer_cast<ViewItem>(item) ?
-                       Qt::SizeVerCursor : Qt::SizeHorCursor);
+                       Qt::SizeHorCursor : Qt::SizeVerCursor);
        else
                unsetCursor();
 }
@@ -116,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();