X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewport.hpp;h=e4c504215d7f266b21ad5c741bb4b90629afa248;hp=2c8211b8dce43b2cee22e8fb872ae7a64af15c2c;hb=c6246dc56ed01d7e99aa65ab88b8c191300b1ebd;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f diff --git a/pv/view/viewport.hpp b/pv/view/viewport.hpp index 2c8211b8..e4c50421 100644 --- a/pv/view/viewport.hpp +++ b/pv/view/viewport.hpp @@ -21,9 +21,12 @@ #ifndef PULSEVIEW_PV_VIEW_VIEWPORT_HPP #define PULSEVIEW_PV_VIEW_VIEWPORT_HPP +#include + #include #include +#include "pv/util.hpp" #include "viewwidget.hpp" class QPainter; @@ -84,16 +87,17 @@ private: * Handles touch begin update and end events. * @param e the event that triggered this handler. */ - bool touch_event(QTouchEvent *e); + bool touch_event(QTouchEvent *event); private: void paintEvent(QPaintEvent *event); - void mouseDoubleClickEvent(QMouseEvent * event); + void mouseDoubleClickEvent(QMouseEvent *event); void wheelEvent(QWheelEvent *event); private: - double drag_offset_; + boost::optional drag_offset_; + int drag_v_offset_; double pinch_offset0_; double pinch_offset1_;