| … | |
… | |
| 646 | my ($self) = @_; |
646 | my ($self) = @_; |
| 647 | |
647 | |
| 648 | warn "no draw defined for $self\n"; |
648 | warn "no draw defined for $self\n"; |
| 649 | } |
649 | } |
| 650 | |
650 | |
| 651 | my $cntx;#d# |
|
|
| 652 | sub DESTROY { |
651 | sub DESTROY { |
| 653 | my ($self) = @_; |
652 | my ($self) = @_; |
| 654 | |
653 | |
| 655 | return if CFPlus::in_destruct; |
654 | return if CFPlus::in_destruct; |
| 656 | |
655 | |
| … | |
… | |
| 769 | sort { $a->{z} <=> $b->{z} } |
768 | sort { $a->{z} <=> $b->{z} } |
| 770 | @{$self->{children}}, @widgets |
769 | @{$self->{children}}, @widgets |
| 771 | ]; |
770 | ]; |
| 772 | |
771 | |
| 773 | $self->realloc; |
772 | $self->realloc; |
|
|
773 | |
|
|
774 | map $_+0, @widgets |
| 774 | } |
775 | } |
| 775 | |
776 | |
| 776 | sub children { |
777 | sub children { |
| 777 | @{ $_[0]{children} } |
778 | @{ $_[0]{children} } |
| 778 | } |
779 | } |
| … | |
… | |
| 789 | } |
790 | } |
| 790 | |
791 | |
| 791 | sub clear { |
792 | sub clear { |
| 792 | my ($self) = @_; |
793 | my ($self) = @_; |
| 793 | |
794 | |
| 794 | my $children = delete $self->{children}; |
795 | my $children = $self->{children}; |
| 795 | $self->{children} = []; |
796 | $self->{children} = []; |
| 796 | |
797 | |
| 797 | for (@$children) { |
798 | for (@$children) { |
| 798 | delete $_->{parent}; |
799 | delete $_->{parent}; |
| 799 | $_->hide; |
800 | $_->hide; |
| … | |
… | |
| 1102 | $self->add ($child) if $child; |
1103 | $self->add ($child) if $child; |
| 1103 | |
1104 | |
| 1104 | $self |
1105 | $self |
| 1105 | } |
1106 | } |
| 1106 | |
1107 | |
| 1107 | #TODO# update range on size_allocate depending on child? |
|
|
| 1108 | |
|
|
| 1109 | sub add { |
1108 | sub add { |
| 1110 | my ($self, $widget) = @_; |
1109 | my ($self, $widget) = @_; |
| 1111 | |
1110 | |
| 1112 | $self->{vp}->add ($self->{child} = $widget); |
1111 | $self->{vp}->add ($self->{child} = $widget); |
| 1113 | } |
1112 | } |
| … | |
… | |
| 1119 | |
1118 | |
| 1120 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1119 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
| 1121 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1120 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
| 1122 | |
1121 | |
| 1123 | my $visible = $w1 > $w2; |
1122 | my $visible = $w1 > $w2; |
| 1124 | if ($visible != $self->{hslider}{visible}) { |
1123 | if ($visible != $self->{hslider_visible}) { |
|
|
1124 | $self->{hslider_visible} = $visible; |
| 1125 | $visible ? $self->SUPER::add ($self->{hslider}) |
1125 | $visible ? $self->SUPER::add ($self->{hslider}) |
| 1126 | : $self->SUPER::remove ($self->{hslider}); |
1126 | : $self->SUPER::remove ($self->{hslider}); |
| 1127 | } |
1127 | } |
| 1128 | |
1128 | |
| 1129 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1129 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
| 1130 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1130 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
| 1131 | |
1131 | |
| 1132 | my $visible = $h1 > $h2; |
1132 | my $visible = $h1 > $h2; |
| 1133 | if ($visible != $self->{vslider}{visible}) { |
1133 | if ($visible != $self->{vslider_visible}) { |
|
|
1134 | $self->{vslider_visible} = $visible; |
| 1134 | $visible ? $self->SUPER::add ($self->{vslider}) |
1135 | $visible ? $self->SUPER::add ($self->{vslider}) |
| 1135 | : $self->SUPER::remove ($self->{vslider}); |
1136 | : $self->SUPER::remove ($self->{vslider}); |
| 1136 | } |
1137 | } |
| 1137 | } |
1138 | } |
| 1138 | |
1139 | |
| 1139 | sub update { |
1140 | sub start_dragging { |
| 1140 | my ($self) = @_; |
1141 | my ($self, $ev) = @_; |
| 1141 | |
1142 | |
| 1142 | $self->update_slider; |
1143 | $self->grab_focus; |
| 1143 | $self->SUPER::update; |
1144 | |
|
|
1145 | my $ox = $self->{vp}{view_x}; |
|
|
1146 | my $oy = $self->{vp}{view_y}; |
|
|
1147 | |
|
|
1148 | $self->{motion} = sub { |
|
|
1149 | my ($ev, $x, $y) = @_; |
|
|
1150 | |
|
|
1151 | $ox -= $ev->{xrel}; |
|
|
1152 | $oy -= $ev->{yrel}; |
|
|
1153 | |
|
|
1154 | $self->{vp}->set_offset ($ox, $oy); |
|
|
1155 | }; |
| 1144 | } |
1156 | } |
| 1145 | |
1157 | |
| 1146 | sub invoke_mouse_wheel { |
1158 | sub invoke_mouse_wheel { |
| 1147 | my ($self, $ev) = @_; |
1159 | my ($self, $ev) = @_; |
| 1148 | |
1160 | |
| 1149 | $self->{vslider}->emit (mouse_wheel => $ev) |
1161 | $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible}; |
| 1150 | if $ev->{dy}; |
|
|
| 1151 | |
|
|
| 1152 | $self->{hslider}->emit (mouse_wheel => $ev) |
1162 | $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible}; |
| 1153 | if $ev->{dx}; |
|
|
| 1154 | |
1163 | |
| 1155 | 1 |
1164 | 1 |
| 1156 | } |
1165 | } |
| 1157 | |
1166 | |
| 1158 | sub invoke_button_down { |
1167 | sub invoke_button_down { |
| 1159 | my ($self, $ev, $x, $y) = @_; |
1168 | my ($self, $ev, $x, $y) = @_; |
| 1160 | |
1169 | |
| 1161 | if ($ev->{button} == 2) { |
1170 | if ($ev->{button} == 2) { |
| 1162 | $self->grab_focus; |
1171 | $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; |
1172 | return 1; |
| 1175 | } |
1173 | } |
| 1176 | |
1174 | |
| 1177 | 0 |
1175 | 0 |
| 1178 | } |
1176 | } |
| … | |
… | |
| 1646 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
1644 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
| 1647 | |
1645 | |
| 1648 | my $sw = sum @w[$c .. $c + $cs - 1]; |
1646 | my $sw = sum @w[$c .. $c + $cs - 1]; |
| 1649 | |
1647 | |
| 1650 | if ($w > $sw) { |
1648 | if ($w > $sw) { |
| 1651 | $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; |
1649 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
| 1652 | } |
1650 | } |
| 1653 | } |
1651 | } |
| 1654 | |
1652 | |
| 1655 | # second pass, rows |
1653 | # second pass, rows |
| 1656 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1654 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
| 1657 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1655 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
| 1658 | |
1656 | |
| 1659 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1657 | my $sh = sum @h[$r .. $r + $rs - 1]; |
| 1660 | |
1658 | |
| 1661 | if ($h > $sh) { |
1659 | if ($h > $sh) { |
| 1662 | $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; |
1660 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
| 1663 | } |
1661 | } |
| 1664 | } |
1662 | } |
| 1665 | |
1663 | |
| 1666 | (\@w, \@h) |
1664 | (\@w, \@h) |
| 1667 | } |
1665 | } |
