ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC vs.
Revision 1.393 by root, Sat Jul 21 13:41:46 2007 UTC

1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647 1647
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1648 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1649
1650 if ($w > $sw) { 1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; 1651 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1652 }
1653 } 1653 }
1654 1654
1655 # second pass, rows 1655 # second pass, rows
1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1658 1658
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1659 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1660
1661 if ($h > $sh) { 1661 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1662 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1663 }
1664 } 1664 }
1665 1665
1666 (\@w, \@h) 1666 (\@w, \@h)
1667} 1667}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines