… | |
… | |
1094 | $vp->{parent}{hslider}->set_value ($x); |
1094 | $vp->{parent}{hslider}->set_value ($x); |
1095 | $vp->{parent}{vslider}->set_value ($y); |
1095 | $vp->{parent}{vslider}->set_value ($y); |
1096 | |
1096 | |
1097 | 0 |
1097 | 0 |
1098 | }, |
1098 | }, |
|
|
1099 | on_size_allocate => sub { |
|
|
1100 | my ($vp, $w, $h) = @_; |
|
|
1101 | $vp->{parent}->update_slider; |
|
|
1102 | 0 |
|
|
1103 | }, |
1099 | ; |
1104 | ; |
1100 | |
1105 | |
1101 | $self->SUPER::add ($self->{vp}); |
1106 | $self->SUPER::add ($self->{vp}); |
1102 | |
1107 | |
1103 | $self->add ($child) if $child; |
1108 | $self->add ($child) if $child; |
… | |
… | |
1114 | sub update_slider { |
1119 | sub update_slider { |
1115 | my ($self) = @_; |
1120 | my ($self) = @_; |
1116 | |
1121 | |
1117 | my $child = ($self->{vp} or return)->child; |
1122 | my $child = ($self->{vp} or return)->child; |
1118 | |
1123 | |
|
|
1124 | if ($self->{scroll_x}) { |
1119 | my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); |
1125 | my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w}); |
1120 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1126 | $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); |
1121 | |
1127 | |
1122 | my $visible = $w1 > $w2; |
1128 | my $visible = $w1 > $w2; |
1123 | if ($visible != $self->{hslider_visible}) { |
1129 | if ($visible != $self->{hslider_visible}) { |
1124 | $self->{hslider_visible} = $visible; |
1130 | $self->{hslider_visible} = $visible; |
1125 | $visible ? $self->SUPER::add ($self->{hslider}) |
1131 | $visible ? $self->SUPER::add ($self->{hslider}) |
1126 | : $self->SUPER::remove ($self->{hslider}); |
1132 | : $self->SUPER::remove ($self->{hslider}); |
|
|
1133 | } |
1127 | } |
1134 | } |
1128 | |
1135 | |
|
|
1136 | if ($self->{scroll_y}) { |
1129 | my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); |
1137 | my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h}); |
1130 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1138 | $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); |
1131 | |
1139 | |
1132 | my $visible = $h1 > $h2; |
1140 | my $visible = $h1 > $h2; |
1133 | if ($visible != $self->{vslider_visible}) { |
1141 | if ($visible != $self->{vslider_visible}) { |
1134 | $self->{vslider_visible} = $visible; |
1142 | $self->{vslider_visible} = $visible; |
1135 | $visible ? $self->SUPER::add ($self->{vslider}) |
1143 | $visible ? $self->SUPER::add ($self->{vslider}) |
1136 | : $self->SUPER::remove ($self->{vslider}); |
1144 | : $self->SUPER::remove ($self->{vslider}); |
|
|
1145 | } |
1137 | } |
1146 | } |
1138 | } |
1147 | } |
1139 | |
1148 | |
1140 | sub start_dragging { |
1149 | sub start_dragging { |
1141 | my ($self, $ev) = @_; |
1150 | my ($self, $ev) = @_; |
… | |
… | |
1721 | |
1730 | |
1722 | use List::Util qw(min max); |
1731 | use List::Util qw(min max); |
1723 | |
1732 | |
1724 | our @ISA = CFPlus::UI::Container::; |
1733 | our @ISA = CFPlus::UI::Container::; |
1725 | |
1734 | |
1726 | sub add { |
1735 | sub add_fixed { |
1727 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
1736 | my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; |
1728 | |
1737 | |
1729 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
1738 | $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; |
1730 | $self->SUPER::add ($child); |
1739 | $self->SUPER::add ($child); |
1731 | } |
1740 | } |
… | |
… | |
4137 | while ($self->{refresh_hook}) { |
4146 | while ($self->{refresh_hook}) { |
4138 | $_->() |
4147 | $_->() |
4139 | for values %{delete $self->{refresh_hook}}; |
4148 | for values %{delete $self->{refresh_hook}}; |
4140 | } |
4149 | } |
4141 | |
4150 | |
4142 | if ($self->{realloc}) { |
4151 | while ($self->{realloc}) { |
4143 | my %queue; |
4152 | my %queue; |
4144 | my @queue; |
4153 | my @queue; |
4145 | my $widget; |
4154 | my $widget; |
4146 | |
4155 | |
4147 | outer: |
4156 | outer: |
… | |
… | |
4194 | } |
4203 | } |
4195 | } |
4204 | } |
4196 | |
4205 | |
4197 | delete $self->{realloc}{$widget+0}; |
4206 | delete $self->{realloc}{$widget+0}; |
4198 | } |
4207 | } |
4199 | } |
|
|
4200 | |
4208 | |
4201 | while (my $size_alloc = delete $self->{size_alloc}) { |
4209 | while (my $size_alloc = delete $self->{size_alloc}) { |
4202 | my @queue = sort { $b->{visible} <=> $a->{visible} } |
4210 | my @queue = sort { $a->{visible} <=> $b->{visible} } |
4203 | values %$size_alloc; |
4211 | values %$size_alloc; |
4204 | |
4212 | |
4205 | while () { |
4213 | while () { |
4206 | my $widget = pop @queue || last; |
4214 | my $widget = pop @queue || last; |
4207 | |
4215 | |
4208 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4216 | my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; |
4209 | |
4217 | |
4210 | $w = 0 if $w < 0; |
|
|
4211 | $h = 0 if $h < 0; |
|
|
4212 | |
|
|
4213 | $w = max $widget->{min_w}, $w; |
4218 | $w = max $widget->{min_w}, $w; |
4214 | $h = max $widget->{min_h}, $h; |
4219 | $h = max $widget->{min_h}, $h; |
4215 | |
4220 | |
4216 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4221 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
4217 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4222 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
4218 | |
4223 | |
4219 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4224 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
4220 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4225 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
4221 | |
4226 | |
4222 | $w = int $w + 0.5; |
4227 | $w = int $w + 0.5; |
4223 | $h = int $h + 0.5; |
4228 | $h = int $h + 0.5; |
4224 | |
4229 | |
4225 | if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { |
4230 | if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { |
4226 | $widget->{old_w} = $widget->{w}; |
4231 | $widget->{old_w} = $widget->{w}; |
4227 | $widget->{old_h} = $widget->{h}; |
4232 | $widget->{old_h} = $widget->{h}; |
4228 | |
4233 | |
4229 | $widget->{w} = $w; |
4234 | $widget->{w} = $w; |
4230 | $widget->{h} = $h; |
4235 | $widget->{h} = $h; |
4231 | |
4236 | |
4232 | $widget->emit (size_allocate => $w, $h); |
4237 | $widget->emit (size_allocate => $w, $h); |
|
|
4238 | } |
4233 | } |
4239 | } |
4234 | } |
4240 | } |
4235 | } |
4241 | } |
4236 | |
4242 | |
4237 | while ($self->{post_alloc_hook}) { |
4243 | while ($self->{post_alloc_hook}) { |