--- deliantra/Deliantra-Client/DC/UI.pm	2007/07/21 13:29:46	1.390
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/07/21 13:37:09	1.392
@@ -1641,15 +1641,22 @@
 
    my @children = $self->children;
 
-   for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
-      my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
+   # first pass, columns
+   for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
+      my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
 
       my $sw = sum @w[$c .. $c + $cs - 1];
-      my $sh = sum @h[$r .. $r + $rs - 1];
 
       if ($w > $sw) {
          $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
       }
+   }
+
+   # second pass, rows
+   for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
+      my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
+
+      my $sh = sum @h[$r .. $r + $rs - 1];
 
       if ($h > $sh) {
          $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];