… | |
… | |
175 | for my $widget (values %WIDGET) { |
175 | for my $widget (values %WIDGET) { |
176 | if ($widget->{is_toplevel}) { |
176 | if ($widget->{is_toplevel}) { |
177 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
177 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
178 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
178 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
179 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
179 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
180 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
|
|
181 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
180 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
182 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
181 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
183 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
182 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
184 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
|
|
185 | } |
183 | } |
186 | } |
184 | } |
187 | |
185 | |
188 | reconfigure_widgets; |
186 | reconfigure_widgets; |
189 | } |
187 | } |
… | |
… | |
214 | } |
212 | } |
215 | |
213 | |
216 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
214 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
217 | |
215 | |
218 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
216 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
219 | $self->{user_x} = $layout->{x} * $::WIDTH; |
217 | $self->{req_x} = $layout->{x} * $::WIDTH; |
220 | $self->{user_y} = $layout->{y} * $::HEIGHT; |
218 | $self->{req_y} = $layout->{y} * $::HEIGHT; |
221 | $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
219 | $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
222 | $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
220 | $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
223 | } |
221 | } |
224 | |
222 | |
225 | $self |
223 | $self |
|
|
224 | } |
|
|
225 | |
|
|
226 | sub toggle_visibility { |
|
|
227 | my ($self) = @_; |
|
|
228 | |
|
|
229 | if ($self->{visible}) { |
|
|
230 | $self->hide; |
|
|
231 | } else { |
|
|
232 | $self->show; |
|
|
233 | } |
226 | } |
234 | } |
227 | |
235 | |
228 | sub destroy { |
236 | sub destroy { |
229 | my ($self) = @_; |
237 | my ($self) = @_; |
230 | |
238 | |
… | |
… | |
232 | %$self = (); |
240 | %$self = (); |
233 | } |
241 | } |
234 | |
242 | |
235 | sub show { |
243 | sub show { |
236 | my ($self) = @_; |
244 | my ($self) = @_; |
|
|
245 | |
237 | return if $self->{parent}; |
246 | return if $self->{parent}; |
238 | |
247 | |
239 | $CFClient::UI::ROOT->add ($self); |
248 | $CFClient::UI::ROOT->add ($self); |
240 | } |
249 | } |
241 | |
250 | |
242 | sub show_centered { |
251 | sub center { |
243 | my ($self) = @_; |
252 | my ($self) = @_; |
244 | return if $self->{parent}; |
|
|
245 | |
|
|
246 | $self->show; |
|
|
247 | |
253 | |
248 | $CFClient::UI::ROOT->on_post_alloc ( |
254 | $CFClient::UI::ROOT->on_post_alloc ( |
249 | "centered $self" => sub { |
255 | "center_$self" => sub { |
250 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
256 | $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5); |
251 | }, |
257 | }, |
252 | ); |
258 | ); |
|
|
259 | |
|
|
260 | $self->update; |
|
|
261 | } |
|
|
262 | |
|
|
263 | sub set_visible { |
|
|
264 | my ($self) = @_; |
|
|
265 | |
|
|
266 | return if $self->{visible}; |
|
|
267 | |
|
|
268 | $self->{root} = $self->{parent}{root}; |
|
|
269 | $self->{visible} = $self->{parent}{visible} + 1; |
|
|
270 | |
|
|
271 | $self->emit (visibility_change => 1); |
253 | } |
272 | } |
254 | |
273 | |
255 | sub set_invisible { |
274 | sub set_invisible { |
256 | my ($self) = @_; |
275 | my ($self) = @_; |
257 | |
276 | |
… | |
… | |
293 | } |
312 | } |
294 | |
313 | |
295 | sub set_size { |
314 | sub set_size { |
296 | my ($self, $w, $h) = @_; |
315 | my ($self, $w, $h) = @_; |
297 | |
316 | |
298 | $self->{user_w} = $w; |
317 | $self->{def_w} = $w; |
299 | $self->{user_h} = $h; |
318 | $self->{def_h} = $h; |
300 | |
319 | |
301 | $self->check_size; |
320 | $self->check_size; |
302 | } |
321 | } |
303 | |
322 | |
304 | sub size_request { |
323 | sub size_request { |
… | |
… | |
490 | sub set_parent { |
509 | sub set_parent { |
491 | my ($self, $parent) = @_; |
510 | my ($self, $parent) = @_; |
492 | |
511 | |
493 | Scalar::Util::weaken ($self->{parent} = $parent); |
512 | Scalar::Util::weaken ($self->{parent} = $parent); |
494 | |
513 | |
495 | if ($parent->{visible} || 1) { |
514 | $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible}; |
496 | $self->{root} = $parent->{root}; |
|
|
497 | $self->{visible} = $parent->{visible} + 1; |
|
|
498 | |
515 | |
499 | $self->emit (visibility_change => 1) |
|
|
500 | unless $self->{parent}{visible}; |
|
|
501 | } |
|
|
502 | |
|
|
503 | # TODO: req_w _does_change after ->reconfigure |
|
|
504 | $self->check_size |
516 | $self->check_size; |
505 | unless exists $self->{req_w}; |
|
|
506 | |
|
|
507 | $self->show; |
|
|
508 | } |
517 | } |
509 | |
518 | |
510 | sub check_size { |
519 | sub check_size { |
511 | my ($self, $forced) = @_; |
520 | my ($self, $forced) = @_; |
512 | |
521 | |
… | |
… | |
825 | } |
834 | } |
826 | |
835 | |
827 | sub size_request { |
836 | sub size_request { |
828 | my ($self) = @_; |
837 | my ($self) = @_; |
829 | |
838 | |
830 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
839 | my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
831 | |
840 | |
832 | @$self{qw(child_w child_h)} |
841 | $w = 10 if $self->{scroll_x}; |
|
|
842 | $h = 10 if $self->{scroll_y}; |
|
|
843 | |
|
|
844 | ($w, $h) |
833 | } |
845 | } |
834 | |
846 | |
835 | sub size_allocate { |
847 | sub size_allocate { |
836 | my ($self, $w, $h) = @_; |
848 | my ($self, $w, $h) = @_; |
837 | |
849 | |
… | |
… | |
993 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
1005 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
994 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1006 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
995 | |
1007 | |
996 | sub new { |
1008 | sub new { |
997 | my $class = shift; |
1009 | my $class = shift; |
998 | |
|
|
999 | # TODO: user_x, user_y, overwrite moveto? |
|
|
1000 | |
1010 | |
1001 | my $self = $class->SUPER::new ( |
1011 | my $self = $class->SUPER::new ( |
1002 | bg => [1, 1, 1, 1], |
1012 | bg => [1, 1, 1, 1], |
1003 | border_bg => [1, 1, 1, 1], |
1013 | border_bg => [1, 1, 1, 1], |
1004 | border => 0.6, |
1014 | border => 0.6, |
… | |
… | |
1066 | my $dx = $ev->{x} - $ox; |
1076 | my $dx = $ev->{x} - $ox; |
1067 | my $dy = $ev->{y} - $oy; |
1077 | my $dy = $ev->{y} - $oy; |
1068 | |
1078 | |
1069 | $self->{user_x} = $wx + $dx * $mx; |
1079 | $self->{user_x} = $wx + $dx * $mx; |
1070 | $self->{user_y} = $wy + $dy * $my; |
1080 | $self->{user_y} = $wy + $dy * $my; |
1071 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
1081 | $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); |
1072 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
1082 | $self->{def_h} = $bh + $dy * ($my ? -1 : 1); |
1073 | $self->move ($self->{user_x}, $self->{user_y}); |
1083 | $self->move ($self->{user_x}, $self->{user_y}); |
1074 | $self->check_size; |
1084 | $self->check_size; |
1075 | }; |
1085 | }; |
1076 | |
1086 | |
1077 | } elsif ($lr ^ $td) { |
1087 | } elsif ($lr ^ $td) { |
… | |
… | |
1083 | |
1093 | |
1084 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1094 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1085 | |
1095 | |
1086 | $self->{user_x} = $bx + $x - $ox; |
1096 | $self->{user_x} = $bx + $x - $ox; |
1087 | $self->{user_y} = $by + $y - $oy; |
1097 | $self->{user_y} = $by + $y - $oy; |
|
|
1098 | |
1088 | $self->move ($self->{user_x}, $self->{user_y}); |
1099 | $self->move ($self->{user_x}, $self->{user_y}); |
1089 | $self->update; |
1100 | $self->update; |
1090 | }; |
1101 | }; |
1091 | } |
1102 | } |
1092 | } |
1103 | } |
… | |
… | |
1291 | } |
1302 | } |
1292 | } |
1303 | } |
1293 | |
1304 | |
1294 | ############################################################################# |
1305 | ############################################################################# |
1295 | |
1306 | |
1296 | package CFClient::UI::HBox; |
1307 | package CFClient::UI::Box; |
1297 | |
|
|
1298 | # TODO: wrap into common Box base class |
|
|
1299 | |
1308 | |
1300 | our @ISA = CFClient::UI::Container::; |
1309 | our @ISA = CFClient::UI::Container::; |
1301 | |
1310 | |
1302 | sub size_request { |
1311 | sub size_request { |
1303 | my ($self) = @_; |
1312 | my ($self) = @_; |
1304 | |
1313 | |
1305 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1314 | $self->{vertical} |
1306 | |
1315 | ? ( |
1307 | ( |
1316 | (List::Util::max map $_->{req_w}, @{$self->{children}}), |
1308 | (List::Util::sum map $_->[0], @alloc), |
1317 | (List::Util::sum map $_->{req_h}, @{$self->{children}}), |
1309 | (List::Util::max map $_->[1], @alloc), |
1318 | ) |
1310 | ) |
1319 | : ( |
|
|
1320 | (List::Util::sum map $_->{req_w}, @{$self->{children}}), |
|
|
1321 | (List::Util::max map $_->{req_h}, @{$self->{children}}), |
|
|
1322 | ) |
1311 | } |
1323 | } |
1312 | |
1324 | |
1313 | sub size_allocate { |
1325 | sub size_allocate { |
1314 | my ($self, $w, $h) = @_; |
1326 | my ($self, $w, $h) = @_; |
1315 | |
1327 | |
1316 | ($h, $w) = ($w, $h); |
1328 | my $space = $self->{vertical} ? $h : $w; |
1317 | |
|
|
1318 | my $children = $self->{children}; |
1329 | my $children = $self->{children}; |
1319 | |
1330 | |
1320 | my @h = map $_->{req_w}, @$children; |
1331 | my @req; |
1321 | |
1332 | |
1322 | my $req_h = List::Util::sum @h; |
1333 | if ($self->{homogeneous}) { |
1323 | |
1334 | @req = ($space / (@$children || 1)) x @$children; |
1324 | if ($req_h > $h) { |
|
|
1325 | # ah well, not enough space |
|
|
1326 | $_ *= $h / $req_h for @h; |
|
|
1327 | } else { |
1335 | } else { |
|
|
1336 | @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; |
|
|
1337 | my $req = List::Util::sum @req; |
|
|
1338 | |
|
|
1339 | if ($req > $space) { |
|
|
1340 | # ah well, not enough space |
|
|
1341 | $_ *= $space / $req for @req; |
|
|
1342 | } else { |
1328 | my $exp = List::Util::sum map $_->{expand}, @$children; |
1343 | my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; |
1329 | $exp ||= 1; |
|
|
1330 | |
1344 | |
|
|
1345 | $space = ($space - $req) / $expand; # remaining space to give away |
|
|
1346 | |
|
|
1347 | $req[$_] += $space * $children->[$_]{expand} |
1331 | for (0 .. $#$children) { |
1348 | for 0 .. $#$children; |
1332 | my $child = $children->[$_]; |
|
|
1333 | |
|
|
1334 | my $alloc_h = $h[$_]; |
|
|
1335 | $alloc_h += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1336 | $h[$_] = $alloc_h; |
|
|
1337 | } |
1349 | } |
1338 | } |
1350 | } |
1339 | |
1351 | |
1340 | CFClient::UI::harmonize \@h; |
1352 | CFClient::UI::harmonize \@req; |
1341 | |
1353 | |
1342 | my $y = 0; |
1354 | my $pos = 0; |
1343 | for (0 .. $#$children) { |
1355 | for (0 .. $#$children) { |
1344 | my $child = $children->[$_]; |
|
|
1345 | my $h = $h[$_]; |
1356 | my $alloc = $req[$_]; |
1346 | $child->configure ($y, 0, $h, $w); |
1357 | $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); |
1347 | |
1358 | |
1348 | $y += $h; |
1359 | $pos += $alloc; |
1349 | } |
1360 | } |
1350 | |
1361 | |
1351 | 1 |
1362 | 1 |
1352 | } |
1363 | } |
1353 | |
1364 | |
1354 | ############################################################################# |
1365 | ############################################################################# |
1355 | |
1366 | |
|
|
1367 | package CFClient::UI::HBox; |
|
|
1368 | |
|
|
1369 | our @ISA = CFClient::UI::Box::; |
|
|
1370 | |
|
|
1371 | sub new { |
|
|
1372 | my $class = shift; |
|
|
1373 | |
|
|
1374 | $class->SUPER::new ( |
|
|
1375 | vertical => 0, |
|
|
1376 | @_, |
|
|
1377 | ) |
|
|
1378 | } |
|
|
1379 | |
|
|
1380 | ############################################################################# |
|
|
1381 | |
1356 | package CFClient::UI::VBox; |
1382 | package CFClient::UI::VBox; |
1357 | |
1383 | |
1358 | # TODO: wrap into common Box base class |
|
|
1359 | |
|
|
1360 | our @ISA = CFClient::UI::Container::; |
1384 | our @ISA = CFClient::UI::Box::; |
1361 | |
1385 | |
1362 | sub size_request { |
1386 | sub new { |
1363 | my ($self) = @_; |
1387 | my $class = shift; |
1364 | |
1388 | |
1365 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1389 | $class->SUPER::new ( |
1366 | |
1390 | vertical => 1, |
1367 | ( |
1391 | @_, |
1368 | (List::Util::max map $_->[0], @alloc), |
|
|
1369 | (List::Util::sum map $_->[1], @alloc), |
|
|
1370 | ) |
1392 | ) |
1371 | } |
|
|
1372 | |
|
|
1373 | sub size_allocate { |
|
|
1374 | my ($self, $w, $h) = @_; |
|
|
1375 | |
|
|
1376 | Carp::confess "negative size" if $w < 0 || $h < 0;#d# |
|
|
1377 | |
|
|
1378 | my $children = $self->{children}; |
|
|
1379 | |
|
|
1380 | my @h = map $_->{req_h}, @$children; |
|
|
1381 | |
|
|
1382 | my $req_h = List::Util::sum @h; |
|
|
1383 | |
|
|
1384 | if ($req_h > $h) { |
|
|
1385 | # ah well, not enough space |
|
|
1386 | $_ *= $h / $req_h for @h; |
|
|
1387 | } else { |
|
|
1388 | my $exp = List::Util::sum map $_->{expand}, @$children; |
|
|
1389 | $exp ||= 1; |
|
|
1390 | |
|
|
1391 | for (0 .. $#$children) { |
|
|
1392 | my $child = $children->[$_]; |
|
|
1393 | |
|
|
1394 | $h[$_] += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1395 | } |
|
|
1396 | } |
|
|
1397 | |
|
|
1398 | CFClient::UI::harmonize \@h; |
|
|
1399 | |
|
|
1400 | my $y = 0; |
|
|
1401 | for (0 .. $#$children) { |
|
|
1402 | my $child = $children->[$_]; |
|
|
1403 | my $h = $h[$_]; |
|
|
1404 | $child->configure (0, $y, $w, $h); |
|
|
1405 | |
|
|
1406 | $y += $h; |
|
|
1407 | } |
|
|
1408 | |
|
|
1409 | 1 |
|
|
1410 | } |
1393 | } |
1411 | |
1394 | |
1412 | ############################################################################# |
1395 | ############################################################################# |
1413 | |
1396 | |
1414 | package CFClient::UI::Label; |
1397 | package CFClient::UI::Label; |
… | |
… | |
2592 | state => 0, |
2575 | state => 0, |
2593 | on_activate => \&toggle_flopper, |
2576 | on_activate => \&toggle_flopper, |
2594 | @_ |
2577 | @_ |
2595 | ); |
2578 | ); |
2596 | |
2579 | |
2597 | if ($self->{state}) { |
|
|
2598 | $self->{state} = 0; |
|
|
2599 | $self->toggle_flopper; |
|
|
2600 | } |
|
|
2601 | |
|
|
2602 | $self |
2580 | $self |
2603 | } |
2581 | } |
2604 | |
2582 | |
2605 | sub toggle_flopper { |
2583 | sub toggle_flopper { |
2606 | my ($self) = @_; |
2584 | my ($self) = @_; |
2607 | |
2585 | |
2608 | # TODO: use animation |
2586 | $self->{other}->toggle_visibility; |
2609 | if ($self->{state} = !$self->{state}) { |
|
|
2610 | $CFClient::UI::ROOT->add ($self->{other}); |
|
|
2611 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
|
|
2612 | $self->_emit ("open"); |
|
|
2613 | } else { |
|
|
2614 | $CFClient::UI::ROOT->remove ($self->{other}); |
|
|
2615 | $self->_emit ("close"); |
|
|
2616 | } |
|
|
2617 | |
|
|
2618 | $self->_emit (changed => $self->{state}); |
|
|
2619 | } |
2587 | } |
2620 | |
2588 | |
2621 | ############################################################################# |
2589 | ############################################################################# |
2622 | |
2590 | |
2623 | package CFClient::UI::Tooltip; |
2591 | package CFClient::UI::Tooltip; |
… | |
… | |
2807 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2775 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2808 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2776 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2809 | |
2777 | |
2810 | $row++; |
2778 | $row++; |
2811 | } |
2779 | } |
2812 | } |
|
|
2813 | |
|
|
2814 | sub size_request { |
|
|
2815 | my ($self) = @_; |
|
|
2816 | ($self->{req_w}, $self->{req_h}); |
|
|
2817 | } |
2780 | } |
2818 | |
2781 | |
2819 | ############################################################################# |
2782 | ############################################################################# |
2820 | |
2783 | |
2821 | package CFClient::UI::Menu; |
2784 | package CFClient::UI::Menu; |
… | |
… | |
3045 | if exists $child->{req_x}; |
3008 | if exists $child->{req_x}; |
3046 | |
3009 | |
3047 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3010 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3048 | if exists $child->{req_y}; |
3011 | if exists $child->{req_y}; |
3049 | |
3012 | |
3050 | $X = $self->{user_x} if exists $self->{user_x}; |
3013 | delete @$child{qw(req_x req_y)}; |
3051 | $Y = $self->{user_y} if exists $self->{user_y}; |
|
|
3052 | |
3014 | |
3053 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3015 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3054 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3016 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3055 | |
3017 | |
3056 | $child->configure ($X, $Y, $W, $H); |
3018 | $child->configure ($X, $Y, $W, $H); |
… | |
… | |
3076 | $::WANT_REFRESH++; |
3038 | $::WANT_REFRESH++; |
3077 | } |
3039 | } |
3078 | |
3040 | |
3079 | sub add { |
3041 | sub add { |
3080 | my ($self, @children) = @_; |
3042 | my ($self, @children) = @_; |
3081 | |
|
|
3082 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3083 | push @widgets, $w->children; |
|
|
3084 | $w->{root} = $self; |
|
|
3085 | $w->{visible} = $self->{visible} + 1; |
|
|
3086 | } |
|
|
3087 | |
3043 | |
3088 | for my $child (@children) { |
3044 | for my $child (@children) { |
3089 | $child->{is_toplevel} = 1; |
3045 | $child->{is_toplevel} = 1; |
3090 | |
3046 | |
3091 | # integerise window positions |
3047 | # integerise window positions |
3092 | $child->{x} = int $child->{x}; |
3048 | $child->{x} = int $child->{x}; |
3093 | $child->{y} = int $child->{y}; |
3049 | $child->{y} = int $child->{y}; |
3094 | } |
3050 | } |
3095 | |
3051 | |
3096 | $self->SUPER::add (@children); |
3052 | $self->SUPER::add (@children); |
|
|
3053 | |
|
|
3054 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3055 | push @widgets, $w->children; |
|
|
3056 | $w->set_visible; |
|
|
3057 | } |
|
|
3058 | |
3097 | } |
3059 | } |
3098 | |
3060 | |
3099 | sub remove { |
3061 | sub remove { |
3100 | my ($self, @children) = @_; |
3062 | my ($self, @children) = @_; |
3101 | |
3063 | |
… | |
… | |
3141 | |
3103 | |
3142 | my $widget = pop @queue || last; |
3104 | my $widget = pop @queue || last; |
3143 | |
3105 | |
3144 | defined $widget->{visible} or last; # do not resize invisible widgets |
3106 | defined $widget->{visible} or last; # do not resize invisible widgets |
3145 | |
3107 | |
3146 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3108 | my ($w, $h) = $widget->{def_w} && $widget->{def_h} |
3147 | ? @$widget{qw(user_w user_h)} |
3109 | ? @$widget{qw(def_w def_h)} |
3148 | : $widget->size_request; |
3110 | : $widget->size_request; |
3149 | |
3111 | |
3150 | if (delete $widget->{force_alloc} |
3112 | if (delete $widget->{force_alloc} |
3151 | or $w != $widget->{req_w} or $h != $widget->{req_h}) { |
3113 | or $w != $widget->{req_w} or $h != $widget->{req_h}) { |
3152 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |
3114 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |
… | |
… | |
3161 | } |
3123 | } |
3162 | } |
3124 | } |
3163 | } |
3125 | } |
3164 | |
3126 | |
3165 | while ($self->{size_alloc}) { |
3127 | while ($self->{size_alloc}) { |
|
|
3128 | for ( |
|
|
3129 | sort { $a->[0]{visible} <=> $b->[0]{visible} } |
3166 | for (values %{delete $self->{size_alloc}}) { |
3130 | values %{delete $self->{size_alloc}} |
|
|
3131 | ) { |
3167 | my ($widget, $w, $h) = @$_; |
3132 | my ($widget, $w, $h) = @$_; |
3168 | |
3133 | |
3169 | $w = 0 if $w < 0; |
3134 | $w = 0 if $w < 0; |
3170 | $h = 0 if $h < 0; |
3135 | $h = 0 if $h < 0; |
3171 | |
3136 | |