X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.hpp;h=e4c504215d7f266b21ad5c741bb4b90629afa248;hp=be3e7d32b719a7d80ca87df69216fbde735b963f;hb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;hpb=e9e4e5e7ea46132262fbd53f708dafc039b3b24f

diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp
index be3e7d32..e4c50421 100644
--- a/pv/view/viewport.hpp
+++ b/pv/view/viewport.hpp
@@ -18,12 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_H
-#define PULSEVIEW_PV_VIEW_VIEWPORT_H
+#ifndef PULSEVIEW_PV_VIEW_VIEWPORT_HPP
+#define PULSEVIEW_PV_VIEW_VIEWPORT_HPP
+
+#include <boost/optional.hpp>
 
 #include <QTimer>
 #include <QTouchEvent>
 
+#include "pv/util.hpp"
 #include "viewwidget.hpp"
 
 class QPainter;
@@ -43,6 +46,13 @@ public:
 	explicit Viewport(View &parent);
 
 private:
+	/**
+	 * Indicates when a view item is being hovered over.
+	 * @param item The item that is being hovered over, or @c nullptr
+	 * if no view item is being hovered over.
+	 */
+	void item_hover(const std::shared_ptr<pv::view::ViewItem> &item);
+
 	/**
 	 * Gets the first view item which has a hit-box that contains @c pt .
 	 * @param pt the point to search with.
@@ -52,25 +62,42 @@ private:
 	std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
 		const QPoint &pt);
 
+	/**
+	 * Sets this item into the dragged state.
+	 */
+	void drag();
+
+	/**
+	 * Drag the background by the delta offset.
+	 * @param delta the drag offset in pixels.
+	 */
+	void drag_by(const QPoint &delta);
+
+	/**
+	 * Sets this item into the un-dragged state.
+	 */
+	void drag_release();
+
 	/**
 	 * Gets the items in the view widget.
 	 */
 	std::vector< std::shared_ptr<pv::view::ViewItem> > items();
 
+	/**
+	 * Handles touch begin update and end events.
+	 * @param e the event that triggered this handler.
+	 */
+	bool touch_event(QTouchEvent *event);
+
+private:
 	void paintEvent(QPaintEvent *event);
 
-	bool event(QEvent *event);
-	void mousePressEvent(QMouseEvent *event);
-	void mouseReleaseEvent(QMouseEvent *event);
-	void mouseMoveEvent(QMouseEvent *event);
-	void mouseDoubleClickEvent(QMouseEvent * event);
+	void mouseDoubleClickEvent(QMouseEvent *event);
 	void wheelEvent(QWheelEvent *event);
-	bool touchEvent(QTouchEvent *e);
 
 private:
-	QPoint mouse_down_point_;
-	double mouse_down_offset_;
-	bool mouse_down_valid_;
+	boost::optional<pv::util::Timestamp> drag_offset_;
+	int drag_v_offset_;
 
 	double pinch_offset0_;
 	double pinch_offset1_;
@@ -80,4 +107,4 @@ private:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_VIEWPORT_H
+#endif // PULSEVIEW_PV_VIEW_VIEWPORT_HPP