i->select(false);
}
-void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
+void ViewWidget::item_hover(const shared_ptr<ViewItem> &item, QPoint pos)
{
(void)item;
+ (void)pos;
}
void ViewWidget::item_clicked(const shared_ptr<ViewItem> &item)
if (any_row_items_selected && !any_time_items_selected) {
// Check all the drag items share a common owner
TraceTreeItemOwner *item_owner = nullptr;
- for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+ for (const shared_ptr<TraceTreeItem>& r : trace_tree_items)
if (r->dragging()) {
if (!item_owner)
item_owner = r->owner();
// Drag the row items
const vector< shared_ptr<RowItem> > row_items(
view_.list_by_type<RowItem>());
- for (shared_ptr<RowItem> r : row_items)
+ for (const shared_ptr<RowItem>& r : row_items)
if (r->dragging()) {
r->drag_by(delta);
TraceTreeItemOwner *item_owner = nullptr;
const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
view_.list_by_type<TraceTreeItem>());
- for (shared_ptr<TraceTreeItem> i : trace_tree_items)
+ for (const shared_ptr<TraceTreeItem>& i : trace_tree_items)
if (i->dragging())
item_owner = i->owner();
bool item_dragged = false;
const auto items = this->items();
for (auto &i : items)
- if (i->selected()) {
+ if (i->selected() && i->is_draggable(event->pos())) {
item_dragged = true;
i->drag();
}
{
assert(event);
- /* Ignore right click events as they will open context menus when
+ if (event->button() & Qt::LeftButton) {
+ mouse_down_point_ = event->pos();
+ mouse_down_item_ = get_mouse_over_item(event->pos());
+ mouse_left_press_event(event);
+ }
+
+ /* Don't forward right click events as they will open context menus when
* used on trace labels. Those menus prevent ViewWidget::mouseReleaseEvent()
* to be triggered upon button release, making mouse_down_item_
* hold the last reference to a view item that might have been deleted
* from the context menu, preventing it from being freed as intended.
+ * TODO Remove this once context menus are handled separately
*/
- if (event->button() & Qt::LeftButton) {
+ if (event->button() & Qt::RightButton)
mouse_down_point_ = event->pos();
- mouse_down_item_ = get_mouse_over_item(event->pos());
- mouse_left_press_event(event);
- }
}
void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
mouse_point_ = event->pos();
if (!event->buttons())
- item_hover(get_mouse_over_item(event->pos()));
+ item_hover(get_mouse_over_item(event->pos()), event->pos());
else if (event->buttons() & Qt::LeftButton) {
if (!item_dragging_) {
if ((event->pos() - mouse_down_point_).manhattanLength() <