| … | |
… | |
| 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; |
| … | |
… | |
| 1102 | $self->add ($child) if $child; |
1102 | $self->add ($child) if $child; |
| 1103 | |
1103 | |
| 1104 | $self |
1104 | $self |
| 1105 | } |
1105 | } |
| 1106 | |
1106 | |
| 1107 | #TODO# update range on size_allocate depending on child? |
|
|
| 1108 | |
|
|
| 1109 | sub add { |
1107 | sub add { |
| 1110 | my ($self, $widget) = @_; |
1108 | my ($self, $widget) = @_; |
| 1111 | |
1109 | |
| 1112 | $self->{vp}->add ($self->{child} = $widget); |
1110 | $self->{vp}->add ($self->{child} = $widget); |
| 1113 | } |
1111 | } |
| … | |
… | |
| 1119 | |
1117 | |
| 1120 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1118 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
| 1121 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1119 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
| 1122 | |
1120 | |
| 1123 | my $visible = $w1 > $w2; |
1121 | my $visible = $w1 > $w2; |
| 1124 | if ($visible != $self->{hslider}{visible}) { |
1122 | if ($visible != $self->{hslider_visible}) { |
|
|
1123 | $self->{hslider_visible} = $visible; |
| 1125 | $visible ? $self->SUPER::add ($self->{hslider}) |
1124 | $visible ? $self->SUPER::add ($self->{hslider}) |
| 1126 | : $self->SUPER::remove ($self->{hslider}); |
1125 | : $self->SUPER::remove ($self->{hslider}); |
| 1127 | } |
1126 | } |
| 1128 | |
1127 | |
| 1129 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1128 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
| 1130 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1129 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
| 1131 | |
1130 | |
| 1132 | my $visible = $h1 > $h2; |
1131 | my $visible = $h1 > $h2; |
| 1133 | if ($visible != $self->{vslider}{visible}) { |
1132 | if ($visible != $self->{vslider_visible}) { |
|
|
1133 | $self->{vslider_visible} = $visible; |
| 1134 | $visible ? $self->SUPER::add ($self->{vslider}) |
1134 | $visible ? $self->SUPER::add ($self->{vslider}) |
| 1135 | : $self->SUPER::remove ($self->{vslider}); |
1135 | : $self->SUPER::remove ($self->{vslider}); |
| 1136 | } |
1136 | } |
| 1137 | } |
|
|
| 1138 | |
|
|
| 1139 | sub update { |
|
|
| 1140 | my ($self) = @_; |
|
|
| 1141 | |
|
|
| 1142 | $self->update_slider; |
|
|
| 1143 | $self->SUPER::update; |
|
|
| 1144 | } |
1137 | } |
| 1145 | |
1138 | |
| 1146 | sub invoke_mouse_wheel { |
1139 | sub invoke_mouse_wheel { |
| 1147 | my ($self, $ev) = @_; |
1140 | my ($self, $ev) = @_; |
| 1148 | |
1141 | |
| … | |
… | |
| 1639 | |
1632 | |
| 1640 | my (@w, @h); |
1633 | my (@w, @h); |
| 1641 | |
1634 | |
| 1642 | my @children = $self->children; |
1635 | my @children = $self->children; |
| 1643 | |
1636 | |
|
|
1637 | # first pass, columns |
| 1644 | for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) { |
1638 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
| 1645 | my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; |
1639 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
| 1646 | |
1640 | |
| 1647 | my $sw = sum @w[$c .. $c + $cs - 1]; |
1641 | my $sw = sum @w[$c .. $c + $cs - 1]; |
|
|
1642 | |
|
|
1643 | if ($w > $sw) { |
|
|
1644 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
|
|
1645 | } |
|
|
1646 | } |
|
|
1647 | |
|
|
1648 | # second pass, rows |
|
|
1649 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
|
|
1650 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
|
|
1651 | |
| 1648 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1652 | my $sh = sum @h[$r .. $r + $rs - 1]; |
| 1649 | |
1653 | |
| 1650 | if ($w > $sw) { |
|
|
| 1651 | $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; |
|
|
| 1652 | } |
|
|
| 1653 | |
|
|
| 1654 | if ($h > $sh) { |
1654 | if ($h > $sh) { |
| 1655 | $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; |
1655 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
| 1656 | } |
1656 | } |
| 1657 | } |
1657 | } |
| 1658 | |
1658 | |
| 1659 | (\@w, \@h) |
1659 | (\@w, \@h) |
| 1660 | } |
1660 | } |
