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();
bool item_dragged = false;
// Drag the row items
- const vector< shared_ptr<RowItem> > row_items(
- view_.list_by_type<RowItem>());
- for (shared_ptr<RowItem> r : row_items)
+ const vector< shared_ptr<ViewItem> > row_items(
+ view_.list_by_type<ViewItem>());
+ for (const shared_ptr<ViewItem>& 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();
clear_selection();
// Set the signal selection state if the item has been clicked
- if (mouse_down_item_) {
+ if (mouse_down_item_ && mouse_down_item_->is_selectable(event->pos())) {
if (ctrl_pressed)
mouse_down_item_->select(!mouse_down_item_->selected());
else
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) {
+ if (event->modifiers() & Qt::ShiftModifier)
+ view_.show_cursors(false);
+
+ mouse_down_point_ = event->pos();
+ mouse_down_offset_ = view_.offset() + event->pos().x() * view_.scale();
+ 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_down_item_ = nullptr;
}
+void ViewWidget::keyReleaseEvent(QKeyEvent *event)
+{
+ // Update mouse_modifiers_ also if modifiers change, but pointer doesn't move
+ if ((mouse_point_.x() >= 0) && (mouse_point_.y() >= 0)) // mouse is inside
+ mouse_modifiers_ = event->modifiers();
+ update();
+}
+
+void ViewWidget::keyPressEvent(QKeyEvent *event)
+{
+ // Update mouse_modifiers_ also if modifiers change, but pointer doesn't move
+ if ((mouse_point_.x() >= 0) && (mouse_point_.y() >= 0)) // mouse is inside
+ mouse_modifiers_ = event->modifiers();
+ update();
+}
+
void ViewWidget::mouseMoveEvent(QMouseEvent *event)
{
assert(event);
mouse_point_ = event->pos();
+ mouse_modifiers_ = event->modifiers();
if (!event->buttons())
- item_hover(get_mouse_over_item(event->pos()));
- else if (event->buttons() & Qt::LeftButton) {
- if (!item_dragging_) {
- if ((event->pos() - mouse_down_point_).manhattanLength() <
- QApplication::startDragDistance())
- return;
+ item_hover(get_mouse_over_item(event->pos()), event->pos());
- if (!accept_drag())
- return;
+ if (event->buttons() & Qt::LeftButton) {
+ if (event->modifiers() & Qt::ShiftModifier) {
+ // Cursor drag
+ pv::util::Timestamp current_offset = view_.offset() + event->pos().x() * view_.scale();
- item_dragging_ = true;
- }
+ const int drag_distance = qAbs(current_offset.convert_to<double>() -
+ mouse_down_offset_.convert_to<double>()) / view_.scale();
- // Do the drag
- drag_items(event->pos() - mouse_down_point_);
+ if (drag_distance > QApplication::startDragDistance()) {
+ view_.show_cursors(true);
+ view_.set_cursors(mouse_down_offset_, current_offset);
+ } else
+ view_.show_cursors(false);
+
+ } else {
+ if (!item_dragging_) {
+ if ((event->pos() - mouse_down_point_).manhattanLength() <
+ QApplication::startDragDistance())
+ return;
+
+ if (!accept_drag())
+ return;
+
+ item_dragging_ = true;
+ }
+
+ // Do the drag
+ drag_items(event->pos() - mouse_down_point_);
+ }
}
+
+ // Force a repaint of the widget to update highlighted parts
+ update();
}
void ViewWidget::leaveEvent(QEvent*)
{
- mouse_point_ = QPoint(-1, -1);
+ bool cursor_above_widget = rect().contains(mapFromGlobal(QCursor::pos()));
+
+ // We receive leaveEvent also when the widget loses focus even when
+ // the mouse cursor hasn't moved at all - e.g. when the popup shows.
+ // However, we don't want to reset mouse_position_ when the mouse is
+ // still above this widget as doing so would break the context menu
+ if (!cursor_above_widget)
+ mouse_point_ = QPoint(INT_MIN, INT_MIN);
+
+ mouse_modifiers_ = Qt::NoModifier;
+ item_hover(nullptr, QPoint());
+
update();
}