[gtk+] Box: Restore an accidentally deleted comment



commit 2a7171534e8cf18fa4716da4a4ba1d6aa4533406
Author: Daniel Boles <dboles src gnome org>
Date:   Mon Dec 26 10:57:51 2016 +0000

    Box: Restore an accidentally deleted comment
    
    Also, split a MAX() onto its own line to match the others.

 gtk/gtkbox.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 15cbb6c..af33b27 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -560,6 +560,7 @@ gtk_box_size_allocate_no_center (GtkWidget           *widget,
     }
   else
     {
+      /* Bring children up to size first */
       extra_space -= children_minimum_size;
       extra_space = MAX (0, extra_space);
       extra_space = gtk_distribute_natural_allocation (extra_space, nvis_children, sizes);
@@ -908,7 +909,8 @@ gtk_box_size_allocate_with_center (GtkWidget           *widget,
           /* Distribute the remainder naturally on each side */
           extra_space = MIN ((box_size - center_size) / 2 - min_size[packing],
                              box_size - center_size - min_size[0] - min_size[1]);
-          extra_space = gtk_distribute_natural_allocation (MAX (0, extra_space), nvis[packing], 
sizes[packing]);
+          extra_space = MAX (0, extra_space);
+          extra_space = gtk_distribute_natural_allocation (extra_space, nvis[packing], sizes[packing]);
 
           /* Calculate space which hasn't distributed yet,
            * and is available for expanding children.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]