projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor whitespace fixes.
[pulseview.git]
/
pv
/
view
/
viewwidget.cpp
diff --git
a/pv/view/viewwidget.cpp
b/pv/view/viewwidget.cpp
index cf7376646586f2a88d9eb5d9680808fd407635af..600dd621a20b6073b09f45552e86ffd0b3a89ab8 100644
(file)
--- a/
pv/view/viewwidget.cpp
+++ b/
pv/view/viewwidget.cpp
@@
-51,6
+51,11
@@
void ViewWidget::clear_selection()
update();
}
update();
}
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+{
+ (void)item;
+}
+
void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
{
(void)item;
void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
{
(void)item;
@@
-74,7
+79,7
@@
bool ViewWidget::accept_drag() const
if (r->dragging()) {
if (!item_owner)
item_owner = r->owner();
if (r->dragging()) {
if (!item_owner)
item_owner = r->owner();
- else if(item_owner != r->owner())
+ else if
(item_owner != r->owner())
return false;
}
return false;
}
@@
-256,30
+261,32
@@
void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
mouse_down_item_ = nullptr;
}
mouse_down_item_ = nullptr;
}
-void ViewWidget::mouseMoveEvent(QMouseEvent *e
vent
)
+void ViewWidget::mouseMoveEvent(QMouseEvent *e)
{
{
- assert(e
vent
);
- mouse_point_ = e
vent
->pos();
+ assert(e);
+ mouse_point_ = e->pos();
- if (!(event->buttons() & Qt::LeftButton))
- return;
-
- if (!item_dragging_)
+ if (!e->buttons())
+ item_hover(get_mouse_over_item(e->pos()));
+ else if (e->buttons() & Qt::LeftButton)
{
{
- if ((event->pos() - mouse_down_point_).manhattanLength() <
- QApplication::startDragDistance())
- return;
+ if (!item_dragging_)
+ {
+ if ((e->pos() - mouse_down_point_).manhattanLength() <
+ QApplication::startDragDistance())
+ return;
- if (!accept_drag())
- return;
+
if (!accept_drag())
+
return;
- item_dragging_ = true;
- }
+
item_dragging_ = true;
+
}
- // Do the drag
-
drag_items(event
->pos() - mouse_down_point_);
+
// Do the drag
+
drag_items(e
->pos() - mouse_down_point_);
- update();
+ update();
+ }
}
void ViewWidget::leaveEvent(QEvent*)
}
void ViewWidget::leaveEvent(QEvent*)