X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewwidget.cpp;h=ce5c27a83dce2a3c6784dcda17e5d0b2e018b9b7;hp=69e345660ab3558cf677ef66a2d7b7083602b65a;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=cc88566ce77bed57358a82dec5da648feb66d10b

diff --git a/pv/view/viewwidget.cpp b/pv/view/viewwidget.cpp
index 69e3456..ce5c27a 100644
--- a/pv/view/viewwidget.cpp
+++ b/pv/view/viewwidget.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <QApplication>
@@ -31,7 +30,8 @@ using std::shared_ptr;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 ViewWidget::ViewWidget(View &parent) :
 	QWidget(&parent),
@@ -48,7 +48,6 @@ void ViewWidget::clear_selection()
 	const auto items = this->items();
 	for (auto &i : items)
 		i->select(false);
-	update();
 }
 
 void ViewWidget::item_hover(const shared_ptr<ViewItem> &item)
@@ -74,8 +73,7 @@ bool ViewWidget::accept_drag() const
 	const bool any_time_items_selected = any_of(items.begin(), items.end(),
 		[](const shared_ptr<TimeItem> &i) { return i->selected(); });
 
-	if (any_row_items_selected && !any_time_items_selected)
-	{
+	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)
@@ -87,9 +85,7 @@ bool ViewWidget::accept_drag() const
 			}
 
 		return true;
-	}
-	else if (any_time_items_selected && !any_row_items_selected)
-	{
+	} else if (any_time_items_selected && !any_row_items_selected) {
 		return true;
 	}
 
@@ -108,23 +104,30 @@ void ViewWidget::drag_items(const QPoint &delta)
 	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()) {
-			item_owner = r->owner();
 			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) {
-		item_dragged = true;
 		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
@@ -187,7 +190,6 @@ void ViewWidget::mouse_left_press_event(QMouseEvent *event)
 		drag();
 
 	selection_changed();
-	update();
 }
 
 void ViewWidget::mouse_left_release_event(QMouseEvent *event)
@@ -207,8 +209,7 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 
 	if (item_dragging_)
 		view_.restack_all_trace_tree_items();
-	else
-	{
+	else {
 		if (!ctrl_pressed) {
 			for (shared_ptr<ViewItem> i : items)
 				if (mouse_down_item_ != i)
@@ -222,9 +223,10 @@ void ViewWidget::mouse_left_release_event(QMouseEvent *event)
 	item_dragging_ = false;
 }
 
-bool ViewWidget::touch_event(QTouchEvent *e)
+bool ViewWidget::touch_event(QTouchEvent *event)
 {
-	(void)e;
+	(void)event;
+
 	return false;
 }
 
@@ -249,16 +251,23 @@ void ViewWidget::mousePressEvent(QMouseEvent *event)
 {
 	assert(event);
 
-	mouse_down_point_ = event->pos();
-	mouse_down_item_ = get_mouse_over_item(event->pos());
-
-	if (event->button() & Qt::LeftButton)
+	/* Ignore 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.
+	 */
+	if (event->button() & Qt::LeftButton) {
+		mouse_down_point_ = event->pos();
+		mouse_down_item_ = get_mouse_over_item(event->pos());
 		mouse_left_press_event(event);
+	}
 }
 
 void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 {
 	assert(event);
+
 	if (event->button() & Qt::LeftButton)
 		mouse_left_release_event(event);
 
@@ -266,18 +275,16 @@ void ViewWidget::mouseReleaseEvent(QMouseEvent *event)
 	mouse_down_item_ = nullptr;
 }
 
-void ViewWidget::mouseMoveEvent(QMouseEvent *e)
+void ViewWidget::mouseMoveEvent(QMouseEvent *event)
 {
-	assert(e);
-	mouse_point_ = e->pos();
-
-	if (!e->buttons())
-		item_hover(get_mouse_over_item(e->pos()));
-	else if (e->buttons() & Qt::LeftButton)
-	{
-		if (!item_dragging_)
-		{
-			if ((e->pos() - mouse_down_point_).manhattanLength() <
+	assert(event);
+	mouse_point_ = event->pos();
+
+	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;
 
@@ -288,9 +295,7 @@ void ViewWidget::mouseMoveEvent(QMouseEvent *e)
 		}
 
 		// Do the drag
-		drag_items(e->pos() - mouse_down_point_);
-
-		update();
+		drag_items(event->pos() - mouse_down_point_);
 	}
 }
 
@@ -300,5 +305,6 @@ void ViewWidget::leaveEvent(QEvent*)
 	update();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv