projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #814 by using PNG application logo instead of SVG
[pulseview.git]
/
pv
/
view
/
viewwidget.cpp
diff --git
a/pv/view/viewwidget.cpp
b/pv/view/viewwidget.cpp
index 30d96eb356259c9669bbfdd243f27db066d4ebfe..79326d2a10a06742a3a2639a6cbd88376d06a704 100644
(file)
--- a/
pv/view/viewwidget.cpp
+++ b/
pv/view/viewwidget.cpp
@@
-223,9
+223,10
@@
void ViewWidget::mouse_left_release_event(QMouseEvent *event)
item_dragging_ = false;
}
item_dragging_ = false;
}
-bool ViewWidget::touch_event(QTouchEvent *e)
+bool ViewWidget::touch_event(QTouchEvent *e
vent
)
{
{
- (void)e;
+ (void)event;
+
return false;
}
return false;
}
@@
-267,16
+268,16
@@
void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
mouse_down_item_ = nullptr;
}
mouse_down_item_ = nullptr;
}
-void ViewWidget::mouseMoveEvent(QMouseEvent *e)
+void ViewWidget::mouseMoveEvent(QMouseEvent *e
vent
)
{
{
- assert(e);
- mouse_point_ = e->pos();
+ assert(e
vent
);
+ mouse_point_ = e
vent
->pos();
- if (!e->buttons())
- item_hover(get_mouse_over_item(e->pos()));
- else if (e->buttons() & Qt::LeftButton) {
+ if (!e
vent
->buttons())
+ item_hover(get_mouse_over_item(e
vent
->pos()));
+ else if (e
vent
->buttons() & Qt::LeftButton) {
if (!item_dragging_) {
if (!item_dragging_) {
- if ((e->pos() - mouse_down_point_).manhattanLength() <
+ if ((e
vent
->pos() - mouse_down_point_).manhattanLength() <
QApplication::startDragDistance())
return;
QApplication::startDragDistance())
return;
@@
-287,7
+288,7
@@
void ViewWidget::mouseMoveEvent(QMouseEvent *e)
}
// Do the drag
}
// Do the drag
- drag_items(e->pos() - mouse_down_point_);
+ drag_items(e
vent
->pos() - mouse_down_point_);
}
}
}
}