| … | |
… | |
| 789 | } |
789 | } |
| 790 | |
790 | |
| 791 | sub clear { |
791 | sub clear { |
| 792 | my ($self) = @_; |
792 | my ($self) = @_; |
| 793 | |
793 | |
| 794 | my $children = delete $self->{children}; |
794 | my $children = $self->{children}; |
| 795 | $self->{children} = []; |
795 | $self->{children} = []; |
| 796 | |
796 | |
| 797 | for (@$children) { |
797 | for (@$children) { |
| 798 | delete $_->{parent}; |
798 | delete $_->{parent}; |
| 799 | $_->hide; |
799 | $_->hide; |
| … | |
… | |
| 1119 | |
1119 | |
| 1120 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1120 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
| 1121 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1121 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
| 1122 | |
1122 | |
| 1123 | my $visible = $w1 > $w2; |
1123 | my $visible = $w1 > $w2; |
| 1124 | if ($visible != $self->{hslider}{visible}) { |
1124 | if ($visible != $self->{hslider_visible}) { |
|
|
1125 | $self->{hslider_visible} = $visible; |
| 1125 | $visible ? $self->SUPER::add ($self->{hslider}) |
1126 | $visible ? $self->SUPER::add ($self->{hslider}) |
| 1126 | : $self->SUPER::remove ($self->{hslider}); |
1127 | : $self->SUPER::remove ($self->{hslider}); |
| 1127 | } |
1128 | } |
| 1128 | |
1129 | |
| 1129 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1130 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
| 1130 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1131 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
| 1131 | |
1132 | |
| 1132 | my $visible = $h1 > $h2; |
1133 | my $visible = $h1 > $h2; |
| 1133 | if ($visible != $self->{vslider}{visible}) { |
1134 | if ($visible != $self->{vslider_visible}) { |
|
|
1135 | $self->{vslider_visible} = $visible; |
| 1134 | $visible ? $self->SUPER::add ($self->{vslider}) |
1136 | $visible ? $self->SUPER::add ($self->{vslider}) |
| 1135 | : $self->SUPER::remove ($self->{vslider}); |
1137 | : $self->SUPER::remove ($self->{vslider}); |
| 1136 | } |
1138 | } |
| 1137 | } |
1139 | } |
| 1138 | |
1140 | |
| … | |
… | |
| 1646 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
1648 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
| 1647 | |
1649 | |
| 1648 | my $sw = sum @w[$c .. $c + $cs - 1]; |
1650 | my $sw = sum @w[$c .. $c + $cs - 1]; |
| 1649 | |
1651 | |
| 1650 | if ($w > $sw) { |
1652 | if ($w > $sw) { |
| 1651 | $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; |
1653 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
| 1652 | } |
1654 | } |
| 1653 | } |
1655 | } |
| 1654 | |
1656 | |
| 1655 | # second pass, rows |
1657 | # second pass, rows |
| 1656 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1658 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
| 1657 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1659 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
| 1658 | |
1660 | |
| 1659 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1661 | my $sh = sum @h[$r .. $r + $rs - 1]; |
| 1660 | |
1662 | |
| 1661 | if ($h > $sh) { |
1663 | if ($h > $sh) { |
| 1662 | $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; |
1664 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
| 1663 | } |
1665 | } |
| 1664 | } |
1666 | } |
| 1665 | |
1667 | |
| 1666 | (\@w, \@h) |
1668 | (\@w, \@h) |
| 1667 | } |
1669 | } |
