… | |
… | |
769 | sort { $a->{z} <=> $b->{z} } |
769 | sort { $a->{z} <=> $b->{z} } |
770 | @{$self->{children}}, @widgets |
770 | @{$self->{children}}, @widgets |
771 | ]; |
771 | ]; |
772 | |
772 | |
773 | $self->realloc; |
773 | $self->realloc; |
|
|
774 | |
|
|
775 | map $_+0, @widgets |
774 | } |
776 | } |
775 | |
777 | |
776 | sub children { |
778 | sub children { |
777 | @{ $_[0]{children} } |
779 | @{ $_[0]{children} } |
778 | } |
780 | } |
… | |
… | |
789 | } |
791 | } |
790 | |
792 | |
791 | sub clear { |
793 | sub clear { |
792 | my ($self) = @_; |
794 | my ($self) = @_; |
793 | |
795 | |
794 | my $children = delete $self->{children}; |
796 | my $children = $self->{children}; |
795 | $self->{children} = []; |
797 | $self->{children} = []; |
796 | |
798 | |
797 | for (@$children) { |
799 | for (@$children) { |
798 | delete $_->{parent}; |
800 | delete $_->{parent}; |
799 | $_->hide; |
801 | $_->hide; |
… | |
… | |
1102 | $self->add ($child) if $child; |
1104 | $self->add ($child) if $child; |
1103 | |
1105 | |
1104 | $self |
1106 | $self |
1105 | } |
1107 | } |
1106 | |
1108 | |
1107 | #TODO# update range on size_allocate depending on child? |
|
|
1108 | |
|
|
1109 | sub add { |
1109 | sub add { |
1110 | my ($self, $widget) = @_; |
1110 | my ($self, $widget) = @_; |
1111 | |
1111 | |
1112 | $self->{vp}->add ($self->{child} = $widget); |
1112 | $self->{vp}->add ($self->{child} = $widget); |
1113 | } |
1113 | } |
… | |
… | |
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 | |
1139 | sub update { |
1141 | sub start_dragging { |
1140 | my ($self) = @_; |
1142 | my ($self, $ev) = @_; |
1141 | |
1143 | |
1142 | $self->update_slider; |
1144 | $self->grab_focus; |
1143 | $self->SUPER::update; |
1145 | |
|
|
1146 | my $ox = $self->{vp}{view_x}; |
|
|
1147 | my $oy = $self->{vp}{view_y}; |
|
|
1148 | |
|
|
1149 | $self->{motion} = sub { |
|
|
1150 | my ($ev, $x, $y) = @_; |
|
|
1151 | |
|
|
1152 | $ox -= $ev->{xrel}; |
|
|
1153 | $oy -= $ev->{yrel}; |
|
|
1154 | |
|
|
1155 | $self->{vp}->set_offset ($ox, $oy); |
|
|
1156 | }; |
1144 | } |
1157 | } |
1145 | |
1158 | |
1146 | sub invoke_mouse_wheel { |
1159 | sub invoke_mouse_wheel { |
1147 | my ($self, $ev) = @_; |
1160 | my ($self, $ev) = @_; |
1148 | |
1161 | |
1149 | $self->{vslider}->emit (mouse_wheel => $ev) |
1162 | $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; |
1150 | if $ev->{dy}; |
|
|
1151 | |
|
|
1152 | $self->{hslider}->emit (mouse_wheel => $ev) |
1163 | $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; |
1153 | if $ev->{dx}; |
|
|
1154 | |
1164 | |
1155 | 1 |
1165 | 1 |
1156 | } |
1166 | } |
1157 | |
1167 | |
1158 | sub invoke_button_down { |
1168 | sub invoke_button_down { |
1159 | my ($self, $ev, $x, $y) = @_; |
1169 | my ($self, $ev, $x, $y) = @_; |
1160 | |
1170 | |
1161 | if ($ev->{button} == 2) { |
1171 | if ($ev->{button} == 2) { |
1162 | $self->grab_focus; |
1172 | $self->start_dragging ($ev); |
1163 | |
|
|
1164 | my $ox = $self->{vp}{view_x} + $ev->{x}; |
|
|
1165 | my $oy = $self->{vp}{view_y} + $ev->{y}; |
|
|
1166 | |
|
|
1167 | $self->{motion} = sub { |
|
|
1168 | my ($ev, $x, $y) = @_; |
|
|
1169 | |
|
|
1170 | $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y}); |
|
|
1171 | $self->update; |
|
|
1172 | }; |
|
|
1173 | |
|
|
1174 | return 1; |
1173 | return 1; |
1175 | } |
1174 | } |
1176 | |
1175 | |
1177 | 0 |
1176 | 0 |
1178 | } |
1177 | } |
… | |
… | |
1640 | my (@w, @h); |
1639 | my (@w, @h); |
1641 | |
1640 | |
1642 | my @children = $self->children; |
1641 | my @children = $self->children; |
1643 | |
1642 | |
1644 | # first pass, columns |
1643 | # first pass, columns |
1645 | for my $widget (sort { $b->{colspan} <=> $a->{colspan} } @children) { |
1644 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
1646 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
1645 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
1647 | |
1646 | |
1648 | my $sw = sum @w[$c .. $c + $cs - 1]; |
1647 | my $sw = sum @w[$c .. $c + $cs - 1]; |
1649 | |
1648 | |
1650 | if ($w > $sw) { |
1649 | if ($w > $sw) { |
1651 | $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; |
1650 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
1652 | } |
1651 | } |
1653 | } |
1652 | } |
1654 | |
1653 | |
1655 | # second pass, rows |
1654 | # second pass, rows |
1656 | for my $widget (sort { $b->{rowspan} <=> $a->{rowspan} } @children) { |
1655 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1657 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1656 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1658 | |
1657 | |
1659 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1658 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1660 | |
1659 | |
1661 | if ($h > $sh) { |
1660 | if ($h > $sh) { |
1662 | $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; |
1661 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
1663 | } |
1662 | } |
1664 | } |
1663 | } |
1665 | |
1664 | |
1666 | (\@w, \@h) |
1665 | (\@w, \@h) |
1667 | } |
1666 | } |