--- deliantra/Deliantra-Client/DC/UI.pm	2007/07/21 13:29:46	1.390
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/07/21 13:54:03	1.394
@@ -791,7 +791,7 @@
 sub clear {
    my ($self) = @_;
 
-   my $children = delete $self->{children};
+   my $children = $self->{children};
    $self->{children} = [];
 
    for (@$children) {
@@ -1121,7 +1121,8 @@
    $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
 
    my $visible = $w1 > $w2;
-   if ($visible != $self->{hslider}{visible}) {
+   if ($visible != $self->{hslider_visible}) {
+      $self->{hslider_visible} = $visible;
       $visible ? $self->SUPER::add ($self->{hslider})
                : $self->SUPER::remove ($self->{hslider});
    }
@@ -1130,7 +1131,8 @@
    $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
 
    my $visible = $h1 > $h2;
-   if ($visible != $self->{vslider}{visible}) {
+   if ($visible != $self->{vslider_visible}) {
+      $self->{vslider_visible} = $visible;
       $visible ? $self->SUPER::add ($self->{vslider})
                : $self->SUPER::remove ($self->{vslider});
    }
@@ -1641,18 +1643,25 @@
 
    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];
+         $_ += ($w - $sw) / ($sw ? $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];
+         $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
       }
    }