projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Viewport: Implemented on-canvas drag
[pulseview.git]
/
pv
/
view
/
viewwidget.cpp
diff --git
a/pv/view/viewwidget.cpp
b/pv/view/viewwidget.cpp
index 816fbf513db042fa48dd6edd48fe7c68bd869453..a5174bb37ecd000332a199cea5790a7792e83770 100644
(file)
--- a/
pv/view/viewwidget.cpp
+++ b/
pv/view/viewwidget.cpp
@@
-85,7
+85,8
@@
bool ViewWidget::accept_drag() const
return true;
}
return true;
}
- return false;
+ // A background drag is beginning
+ return true;
}
bool ViewWidget::mouse_down() const
}
bool ViewWidget::mouse_down() const
@@
-96,6
+97,8
@@
bool ViewWidget::mouse_down() const
void ViewWidget::drag_items(const QPoint &delta)
{
void ViewWidget::drag_items(const QPoint &delta)
{
+ bool item_dragged = false;
+
// Drag the row items
RowItemOwner *item_owner = nullptr;
for (std::shared_ptr<RowItem> r : view_)
// Drag the row items
RowItemOwner *item_owner = nullptr;
for (std::shared_ptr<RowItem> r : view_)
@@
-108,6
+111,7
@@
void ViewWidget::drag_items(const QPoint &delta)
}
if (item_owner) {
}
if (item_owner) {
+ item_dragged = true;
item_owner->restack_items();
for (const auto &r : *item_owner)
r->animate_to_layout_v_offset();
item_owner->restack_items();
for (const auto &r : *item_owner)
r->animate_to_layout_v_offset();
@@
-116,8
+120,27
@@
void ViewWidget::drag_items(const QPoint &delta)
// Drag the time items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
for (auto &i : items)
// Drag the time items
const vector< shared_ptr<TimeItem> > items(view_.time_items());
for (auto &i : items)
- if (i->dragging())
+ if (i->dragging())
{
i->drag_by(delta);
i->drag_by(delta);
+ item_dragged = true;
+ }
+
+ // Do the background drag
+ if (!item_dragged)
+ drag_by(delta);
+}
+
+void ViewWidget::drag()
+{
+}
+
+void ViewWidget::drag_by(const QPoint &delta)
+{
+ (void)delta;
+}
+
+void ViewWidget::drag_release()
+{
}
void ViewWidget::mouse_left_press_event(QMouseEvent *event)
}
void ViewWidget::mouse_left_press_event(QMouseEvent *event)
@@
-141,10
+164,17
@@
void ViewWidget::mouse_left_press_event(QMouseEvent *event)
}
// Save the offsets of any signals which will be dragged
}
// Save the offsets of any signals which will be dragged
+ bool item_dragged = false;
const auto items = this->items();
for (auto &i : items)
const auto items = this->items();
for (auto &i : items)
- if (i->selected())
+ if (i->selected()) {
+ item_dragged = true;
i->drag();
i->drag();
+ }
+
+ // Do the background drag
+ if (!item_dragged)
+ drag();
selection_changed();
update();
selection_changed();
update();