projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
83d8efb
)
ViewWidget: Added drag-handling support for non-TraceTreeItems
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 7 Sep 2015 00:39:29 +0000
(18:39 -0600)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 18 Oct 2015 21:32:30 +0000
(15:32 -0600)
pv/view/viewwidget.cpp
patch
|
blob
|
history
diff --git
a/pv/view/viewwidget.cpp
b/pv/view/viewwidget.cpp
index 38732046f11f896756a79536e0a94db79234e8ae..2a97eefc2dc1577b4afa7596fedf12a32114914c 100644
(file)
--- a/
pv/view/viewwidget.cpp
+++ b/
pv/view/viewwidget.cpp
@@
-107,23
+107,30
@@
void ViewWidget::drag_items(const QPoint &delta)
bool item_dragged = false;
// Drag the row items
bool item_dragged = false;
// Drag the row items
- TraceTreeItemOwner *item_owner = nullptr;
- const vector< shared_ptr<TraceTreeItem> > trace_tree_items(
- view_.list_by_type<TraceTreeItem>());
- for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+ const vector< shared_ptr<RowItem> > row_items(
+ view_.list_by_type<RowItem>());
+ for (shared_ptr<RowItem> r : row_items)
if (r->dragging()) {
if (r->dragging()) {
- item_owner = r->owner();
r->drag_by(delta);
// Ensure the trace is selected
r->select();
r->drag_by(delta);
// Ensure the trace is selected
r->select();
+
+ item_dragged = true;
}
}
+ // If an item is being dragged, update the stacking
+ 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)
+ if (i->dragging())
+ item_owner = i->owner();
+
if (item_owner) {
if (item_owner) {
- item_dragged = true;
item_owner->restack_items();
item_owner->restack_items();
- for (shared_ptr<TraceTreeItem>
r
: trace_tree_items)
-
r
->animate_to_layout_v_offset();
+ for (shared_ptr<TraceTreeItem>
i
: trace_tree_items)
+
i
->animate_to_layout_v_offset();
}
// Drag the time items
}
// Drag the time items