X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fviewport.cpp;h=bf15e41c4387688f926645b51f79378df68e7006;hb=66a43b4f9cf76853e99e7f5fc2f9df49ec58bd34;hp=6c51d0a1f4a4c44f4964421000edd7cc16aad9a7;hpb=af33d4cbacc745f4473f5c0f4fa1f9ebb8d84d0a;p=pulseview.git

diff --git a/pv/views/trace/viewport.cpp b/pv/views/trace/viewport.cpp
index 6c51d0a1..bf15e41c 100644
--- a/pv/views/trace/viewport.cpp
+++ b/pv/views/trace/viewport.cpp
@@ -54,6 +54,17 @@ Viewport::Viewport(View &parent) :
 {
 	setAutoFillBackground(true);
 	setBackgroundRole(QPalette::Base);
+
+	// Set up settings and event handlers
+	GlobalSettings settings;
+	allow_vertical_dragging_ = settings.value(GlobalSettings::Key_View_AllowVerticalDragging).toBool();
+
+	GlobalSettings::add_change_handler(this);
+}
+
+Viewport::~Viewport()
+{
+	GlobalSettings::remove_change_handler(this);
 }
 
 shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
@@ -70,7 +81,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();
 }
@@ -78,7 +89,9 @@ void Viewport::item_hover(const shared_ptr<ViewItem> &item, QPoint pos)
 void Viewport::drag()
 {
 	drag_offset_ = view_.offset();
-	drag_v_offset_ = view_.owner_visual_v_offset();
+
+	if (allow_vertical_dragging_)
+		drag_v_offset_ = view_.owner_visual_v_offset();
 }
 
 void Viewport::drag_by(const QPoint &delta)
@@ -89,7 +102,8 @@ void Viewport::drag_by(const QPoint &delta)
 	view_.set_scale_offset(view_.scale(),
 		(*drag_offset_ - delta.x() * view_.scale()));
 
-	view_.set_v_offset(-drag_v_offset_ - delta.y());
+	if (allow_vertical_dragging_)
+		view_.set_v_offset(-drag_v_offset_ - delta.y());
 }
 
 void Viewport::drag_release()
@@ -116,6 +130,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();
@@ -225,6 +242,12 @@ void Viewport::wheelEvent(QWheelEvent *event)
 	}
 }
 
+void Viewport::on_setting_changed(const QString &key, const QVariant &value)
+{
+	if (key == GlobalSettings::Key_View_AllowVerticalDragging)
+		allow_vertical_dragging_ = value.toBool();
+}
+
 } // namespace trace
 } // namespace views
 } // namespace pv