| … | |
… | |
| 1640 | my (@w, @h); |
1640 | my (@w, @h); |
| 1641 | |
1641 | |
| 1642 | my @children = $self->children; |
1642 | my @children = $self->children; |
| 1643 | |
1643 | |
| 1644 | # first pass, columns |
1644 | # first pass, columns |
| 1645 | for my $widget (sort { $b->{colspan} <=> $a->{colspan} } @children) { |
1645 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
| 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) / $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 { $b->{rowspan} <=> $a->{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) { |
