Simplified the height computation logic

Author: ErikReider

src/animatedList/animatedList.vala

@@ -214,7 +214,6 @@ public class AnimatedList : Gtk.Widget, Gtk.Scrollable {
         fade_distance = 0;
 
         int num_vexpand_children = 0;
-        WidgetHeights measured_height = WidgetHeights ();
         WidgetHeights[] heights = new WidgetHeights[n_children];
         int total_min = 0;
         int total_nat = 0;
@@ -259,11 +258,12 @@ public class AnimatedList : Gtk.Widget, Gtk.Scrollable {
 
         bool allocate_nat = false;
         int extra_height = 0;
-        if (height >= measured_height.nat_height) {
+        if (height == total_min) {
             allocate_nat = true;
-            extra_height = height - measured_height.nat_height;
-        } else {
-            warn_if_reached ();
+            extra_height = height - total_min;
+        } else if (height >= total_nat) {
+            allocate_nat = true;
+            extra_height = height - total_nat;
         }
 
         int y = 0;

src/notificationGroup/expandableGroup.vala

@@ -108,7 +108,6 @@ namespace SwayNotificationCenter {
                                      int height,
                                      compute_height_iter_cb iter_callback) {
             int num_vexpand_children = 0;
-            WidgetHeights measured_height = WidgetHeights ();
             WidgetHeights[] heights = new WidgetHeights[n_children];
             int total_min = 0;
             int total_nat = 0;
@@ -149,11 +148,12 @@ namespace SwayNotificationCenter {
 
             bool allocate_nat = false;
             int extra_height = 0;
-            if (height >= measured_height.nat_height) {
+            if (height == total_min) {
                 allocate_nat = true;
-                extra_height = height - measured_height.nat_height;
-            } else {
-                warn_if_reached ();
+                extra_height = height - total_min;
+            } else if (height >= total_nat) {
+                allocate_nat = true;
+                extra_height = height - total_nat;
             }
 
             WidgetAlloc first_allocation = WidgetAlloc ();
@@ -190,8 +190,6 @@ namespace SwayNotificationCenter {
         }
 
         protected override void size_allocate (int width, int height, int baseline) {
-            base.size_allocate (width, height, baseline);
-
             // Recalculate which children are visible, so clear the old list
             while (!visible_widgets.is_empty ()) {
                 visible_widgets.delete_link (visible_widgets.nth (0));