X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fviewport.cpp;h=c45e455b0ac091abe812f67279d4500196c2064c;hb=7c238e082a6fadc14f90285805f5901cc8f68570;hp=9f60c1a82ad123897d93b4a6b3360045ffa074ea;hpb=4b4f1c0dc17b481b798e60bbc3fa639c09a9c788;p=pulseview.git diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp index 9f60c1a8..c45e455b 100644 --- a/pv/view/viewport.cpp +++ b/pv/view/viewport.cpp @@ -19,6 +19,7 @@ */ #include +#include #include "view.h" #include "viewport.h" @@ -28,6 +29,7 @@ #include +using std::abs; using std::max; using std::min; using std::shared_ptr; @@ -38,7 +40,7 @@ namespace view { Viewport::Viewport(View &parent) : QWidget(&parent), - _view(parent), + _view(parent), _mouse_down_valid(false), _pinch_zoom_active(false) { @@ -102,7 +104,7 @@ void Viewport::paintEvent(QPaintEvent*) bool Viewport::event(QEvent *event) { - switch(event->type()) { + switch (event->type()) { case QEvent::TouchBegin: case QEvent::TouchUpdate: case QEvent::TouchEnd: @@ -121,8 +123,7 @@ void Viewport::mousePressEvent(QMouseEvent *event) { assert(event); - if (event->button() == Qt::LeftButton) - { + if (event->button() == Qt::LeftButton) { _mouse_down_point = event->pos(); _mouse_down_offset = _view.offset(); _mouse_down_valid = true; @@ -134,18 +135,15 @@ void Viewport::mouseReleaseEvent(QMouseEvent *event) assert(event); if (event->button() == Qt::LeftButton) - { _mouse_down_valid = false; - } } void Viewport::mouseMoveEvent(QMouseEvent *event) { assert(event); - if (event->buttons() & Qt::LeftButton) - { - if (! _mouse_down_valid) { + if (event->buttons() & Qt::LeftButton) { + if (!_mouse_down_valid) { _mouse_down_point = event->pos(); _mouse_down_offset = _view.offset(); _mouse_down_valid = true;