View: Make sure unused groups are freed

[pulseview.git] / pv / view / view.cpp

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index b7ee331f165c175bdaaf1080561b2ae31650644e..8d5bd6d3ad02b836d7d5ee1f0f29e8f1cccf4a99 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -1038,13 +1038,15 @@ void View::signals_changed()
                                        offset += extents.second;
                        }
 
-                       // Assign proper vertical offsets to each channel in the group
-                       new_trace_group->restack_items();
-
-                       // If this is a new group, enqueue it in the new top level
-                       // items list
-                       if (!new_traces_in_group.empty() && new_trace_group)
-                               new_top_level_items.push_back(new_trace_group);
+                       if (new_trace_group) {
+                               // Assign proper vertical offsets to each channel in the group
+                               new_trace_group->restack_items();
+
+                               // If this is a new group, enqueue it in the new top level
+                               // items list
+                               if (!new_traces_in_group.empty())
+                                       new_top_level_items.push_back(new_trace_group);
+                       }
                }
 
        // Enqueue the remaining logic channels in a group
@@ -1083,17 +1085,28 @@ void View::signals_changed()
                owner->remove_child_item(trace);
        }
 
+       // Remove any empty trace groups
+       for (shared_ptr<TraceGroup> group : list_by_type<TraceGroup>())
+               if (group->child_items().size() == 0) {
+                       remove_child_item(group);
+                       group.reset();
+               }
+
        // Add and position the pending top levels items
        for (auto item : new_top_level_items) {
+               add_child_item(item);
+
                // Position the item after the last item or at the top if there is none
                int offset = v_extents().second;
+               const pair<int, int> extents = item->v_extents();
+
+               if (item->enabled())
+                       offset += -extents.first;
 
-               add_child_item(item);
                item->force_to_v_offset(offset);
 
-               const pair<int, int> extents = item->v_extents();
                if (item->enabled())
-                       offset += (extents.second - extents.first);
+                       offset += extents.second;
        }
 
        update_layout();