ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.249 by root, Sun May 28 01:40:02 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 2006 UTC

… …
55 55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH; 57 if $x + $TOOLTIP->{w} > $::WIDTH;
58 58
59 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update; 60 $TOOLTIP->realloc;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
221 } 220 }
222 221
223 $self 222 $self
224} 223}
225 224
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234}
235
236sub destroy { 225sub destroy {
237 my ($self) = @_; 226 my ($self) = @_;
238 227
239 $self->hide; 228 $self->hide;
240 %$self = (); 229 %$self = ();
… …
267 256
268 $self->{root} = $self->{parent}{root}; 257 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 258 $self->{visible} = $self->{parent}{visible} + 1;
270 259
271 $self->emit (visibility_change => 1); 260 $self->emit (visibility_change => 1);
261
262 $self->realloc unless exists $self->{req_w};
263
264 $_->set_visible for $self->children;
272} 265}
273 266
274sub set_invisible { 267sub set_invisible {
275 my ($self) = @_; 268 my ($self) = @_;
276 269
277 return unless $self->{visible}; 270 return unless $self->{visible};
278 271
279 # broken show/hide model 272 $_->set_invisible for $self->children;
280 273
281 delete $self->{root}; 274 delete $self->{root};
282 delete $self->{visible}; 275 delete $self->{visible};
283 276
284 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 278 undef $HOVER if $HOVER == $self;
286 279
287 CFClient::UI::check_tooltip 280 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 281 if $TOOLTIP->{owner} == $self;
289 282
290 $self->focus_out; 283 $self->focus_out;
291 284
292 $self->emit (visibility_change => 0); 285 $self->emit (visibility_change => 0);
286}
287
288sub set_visibility {
289 my ($self, $visible) = @_;
290
291 return if $self->{visible} == $visible;
292
293 $visible ? $self->hide
294 : $self->show;
295}
296
297sub toggle_visibility {
298 my ($self) = @_;
299
300 $self->{visible}
301 ? $self->hide
302 : $self->show;
293} 303}
294 304
295sub hide { 305sub hide {
296 my ($self) = @_; 306 my ($self) = @_;
297 307
… …
315 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
316 326
317 $self->{def_w} = $w; 327 $self->{def_w} = $w;
318 $self->{def_h} = $h; 328 $self->{def_h} = $h;
319 329
320 $self->check_size; 330 $self->realloc;
321} 331}
322 332
323sub size_request { 333sub size_request {
324 require Carp; 334 require Carp;
325 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
345 $self->{y} = $y; 355 $self->{y} = $y;
346 $self->update; 356 $self->update;
347 } 357 }
348 358
349 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
351 } 363 }
352} 364}
353 365
354sub size_allocate { 366sub size_allocate {
355 # nothing to be done 367 # nothing to be done
356}
357
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363} 368}
364 369
365sub children { 370sub children {
366} 371}
367 372
… …
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455
456sub find_widget {
457 my ($self, $x, $y) = @_;
458
459 return () unless $self->{can_events};
460
461 return $self
462 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
463 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
464
465 ()
466}
467
468sub set_parent {
469 my ($self, $parent) = @_;
470
471 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499}
500
501sub realloc {
502 my ($self) = @_;
503
504 return unless $self->{visible};
505
506 return if $self->{root}{realloc}{$self};
507
508 $self->{root}{realloc}{$self} = $self;
509 $self->{root}->update;
510}
511
512sub update {
513 my ($self) = @_;
514
515 $self->{parent}->update
516 if $self->{parent};
517}
450 518
451sub draw { 519sub draw {
452 my ($self) = @_; 520 my ($self) = @_;
453 521
454 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
492 my ($self) = @_; 560 my ($self) = @_;
493 561
494 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
495} 563}
496 564
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
517}
518
519sub check_size {
520 my ($self, $forced) = @_;
521
522 $self->{force_alloc} = 1 if $forced;
523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
524}
525
526sub update {
527 my ($self) = @_;
528
529 $self->{parent}->update
530 if $self->{parent};
531}
532
533sub connect {
534 my ($self, $signal, $cb) = @_;
535
536 push @{ $self->{signal_cb}{$signal} }, $cb;
537}
538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
545sub emit {
546 my ($self, $signal, @args) = @_;
547
548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
554}
555
556sub DESTROY { 565sub DESTROY {
557 my ($self) = @_; 566 my ($self) = @_;
558 567
559 delete $WIDGET{$self+0}; 568 delete $WIDGET{$self+0};
560 #$self->deactivate; 569 #$self->deactivate;
… …
655 $self->{children} = [ 664 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
658 ]; 667 ];
659 668
660 $self->check_size (1); 669 $self->realloc;
661 $self->update;
662} 670}
663 671
664sub children { 672sub children {
665 @{ $_[0]{children} } 673 @{ $_[0]{children} }
666} 674}
… …
671 delete $child->{parent}; 679 delete $child->{parent};
672 $child->hide; 680 $child->hide;
673 681
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 683
676 $self->check_size (1); 684 $self->realloc;
677 $self->update;
678} 685}
679 686
680sub clear { 687sub clear {
681 my ($self) = @_; 688 my ($self) = @_;
682 689
… …
686 for (@$children) { 693 for (@$children) {
687 delete $_->{parent}; 694 delete $_->{parent};
688 $_->hide; 695 $_->hide;
689 } 696 }
690 697
691 $self->check_size; 698 $self->realloc;
692 $self->update;
693} 699}
694 700
695sub find_widget { 701sub find_widget {
696 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
697 703
… …
750sub size_request { 756sub size_request {
751 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
752} 758}
753 759
754sub size_allocate { 760sub size_allocate {
755 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
756 762
757 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
758} 764}
759 765
760############################################################################# 766#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 784 $self->SUPER::update;
779} 785}
780 786
781sub size_allocate { 787sub size_allocate {
782 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
783 789
784 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update; 791 $self->update
792 if $changed;
786} 793}
787 794
788sub _render { 795sub _render {
789 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
790} 797}
… …
843 850
844 ($w, $h) 851 ($w, $h)
845} 852}
846 853
847sub size_allocate { 854sub size_allocate {
848 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
849 856
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
852 859
853 $self->child->configure (0, 0, $w, $h); 860 $self->child->configure (0, 0, $w, $h);
… …
940 my $child = $self->{vp}->child; 947 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
942} 949}
943 950
944sub size_allocate { 951sub size_allocate {
945 my ($self, $w, $h) = @_; 952 my ($self, $w, $h, $changed) = @_;
946 953
947 $self->SUPER::size_allocate ($w, $h); 954 $self->SUPER::size_allocate ($w, $h, $changed);
948 955
949 my $child = $self->{vp}->child; 956 my $child = $self->{vp}->child;
950 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
951} 958}
952 959
… …
1040 $h + $self->border * 2, 1047 $h + $self->border * 2,
1041 ) 1048 )
1042} 1049}
1043 1050
1044sub size_allocate { 1051sub size_allocate {
1045 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
1046 1055
1047 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
1049 1058
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1079 $self->{user_x} = $wx + $dx * $mx; 1088 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my; 1089 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1092 $self->move ($self->{user_x}, $self->{user_y});
1084 $self->check_size; 1093 $self->realloc;
1085 }; 1094 };
1086 1095
1087 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1095 1104
1096 $self->{user_x} = $bx + $x - $ox; 1105 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy; 1106 $self->{user_y} = $by + $y - $oy;
1098 1107
1099 $self->move ($self->{user_x}, $self->{user_y}); 1108 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update; 1109 $self->realloc;
1101 }; 1110 };
1102 } 1111 }
1103} 1112}
1104 1113
1105sub button_up { 1114sub button_up {
… …
1180 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1181 1190
1182 $child->set_parent ($self); 1191 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1184 1193
1185 $self->check_size (1); 1194 $self->realloc;
1186} 1195}
1187 1196
1188# TODO: move to container class maybe? send children a signal on removal? 1197# TODO: move to container class maybe? send children a signal on removal?
1189sub clear { 1198sub clear {
1190 my ($self) = @_; 1199 my ($self) = @_;
… …
1195 for (@children) { 1204 for (@children) {
1196 delete $_->{parent}; 1205 delete $_->{parent};
1197 $_->hide; 1206 $_->hide;
1198 } 1207 }
1199 1208
1200 $self->check_size (1); 1209 $self->realloc;
1201 $self->update;
1202} 1210}
1203 1211
1204sub get_wh { 1212sub get_wh {
1205 my ($self) = @_; 1213 my ($self) = @_;
1206 1214
… …
1233 (sum @$hs), 1241 (sum @$hs),
1234 ) 1242 )
1235} 1243}
1236 1244
1237sub size_allocate { 1245sub size_allocate {
1238 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1239 1247
1240 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1241 1249
1242 my $req_w = (sum @$ws) || 1; 1250 my $req_w = (sum @$ws) || 1;
1243 my $req_h = (sum @$hs) || 1; 1251 my $req_h = (sum @$hs) || 1;
… …
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1329 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 ) 1330 )
1323} 1331}
1324 1332
1325sub size_allocate { 1333sub size_allocate {
1326 my ($self, $w, $h) = @_; 1334 my ($self, $w, $h, $changed) = @_;
1327 1335
1328 my $space = $self->{vertical} ? $h : $w; 1336 my $space = $self->{vertical} ? $h : $w;
1329 my $children = $self->{children}; 1337 my $children = $self->{children};
1330 1338
1331 my @req; 1339 my @req;
… …
1460 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1461 1469
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1464 1472
1465 $self->update; 1473 $self->realloc;
1466 $self->check_size;
1467} 1474}
1468 1475
1469sub set_markup { 1476sub set_markup {
1470 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1471 1478
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1483
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1479 1486
1480 $self->update; 1487 $self->realloc;
1481 $self->check_size;
1482} 1488}
1483 1489
1484sub size_request { 1490sub size_request {
1485 my ($self) = @_; 1491 my ($self) = @_;
1486 1492
… …
1507 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1508 ) 1514 )
1509} 1515}
1510 1516
1511sub size_allocate { 1517sub size_allocate {
1512 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1513 1519
1514 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1515} 1522}
1516 1523
1517sub set_fontsize { 1524sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1519 1526
1520 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1528 delete $self->{texture};
1522 1529
1523 $self->update; 1530 $self->realloc;
1524 $self->check_size;
1525} 1531}
1526 1532
1527sub _draw { 1533sub _draw {
1528 my ($self) = @_; 1534 my ($self) = @_;
1529 1535
… …
1609sub set_text { 1615sub set_text {
1610 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1611 1617
1612 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1619 $self->_set_text ($text);
1614 $self->update; 1620
1615 $self->check_size; 1621 $self->realloc;
1616} 1622}
1617 1623
1618sub get_text { 1624sub get_text {
1619 $_[0]{text} 1625 $_[0]{text}
1620} 1626}
… …
1653 } elsif ($uni) { 1659 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1655 } 1661 }
1656 1662
1657 $self->_set_text ($text); 1663 $self->_set_text ($text);
1658 $self->update; 1664
1659 $self->check_size; 1665 $self->realloc;
1660} 1666}
1661 1667
1662sub focus_in { 1668sub focus_in {
1663 my ($self) = @_; 1669 my ($self) = @_;
1664 1670
… …
2171 $self->update; 2177 $self->update;
2172 2178
2173 $self 2179 $self
2174} 2180}
2175 2181
2182sub changed { }
2183
2176sub set_range { 2184sub set_range {
2177 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2178 2186
2179 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2180 2188
… …
2369 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2370 $self->reflow; 2378 $self->reflow;
2371} 2379}
2372 2380
2373sub size_allocate { 2381sub size_allocate {
2374 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2375 2383
2376 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2377 2387
2378 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2379 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2381 2391
… …
2623 2633
2624 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2625} 2635}
2626 2636
2627sub size_allocate { 2637sub size_allocate {
2628 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2629 2639
2640 return unless $changed;
2641
2630 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2631} 2643}
2632 2644
2633sub _draw { 2645sub _draw {
2634 my ($self) = @_; 2646 my ($self) = @_;
2635 2647
… …
2970use CFClient::OpenGL; 2982use CFClient::OpenGL;
2971 2983
2972sub new { 2984sub new {
2973 my $class = shift; 2985 my $class = shift;
2974 2986
2975 $class->SUPER::new ( 2987 my $self = $class->SUPER::new (
2976 visible => 1, 2988 visible => 1,
2977 @_, 2989 @_,
2978 ) 2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
2979} 2995}
2980 2996
2981sub configure { 2997sub configure {
2982 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2983 2999
2984 $self->{w} = $w; 3000 $self->{w} = $w;
2985 $self->{h} = $h; 3001 $self->{h} = $h;
2986} 3002}
2987 3003
2988sub check_size { 3004sub reconfigure {
2989 my ($self) = @_; 3005 my ($self) = @_;
2990 3006
3007 $self->SUPER::reconfigure;
3008
2991 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
2992 if $self->{w}; 3010 if $self->{w};
2993} 3011}
2994 3012
2995sub size_request { 3013sub size_request {
2996 my ($self) = @_; 3014 my ($self) = @_;
2997 3015
2998 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
2999} 3017}
3000 3018
3001sub size_allocate { 3019sub size_allocate {
3002 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
3003 3021
3004 for my $child ($self->children) { 3022 for my $child ($self->children) {
3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006 3024
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3008 if exists $child->{req_x}; 3026 if exists $child->{req_x};
3009 3027
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3011 if exists $child->{req_y}; 3029 if exists $child->{req_y};
3012 3030
3013 delete @$child{qw(req_x req_y)}; 3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3014 3032
3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017 3035
3018 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
… …
3032} 3050}
3033 3051
3034sub update { 3052sub update {
3035 my ($self) = @_; 3053 my ($self) = @_;
3036 3054
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
3039} 3056}
3040 3057
3041sub add { 3058sub add {
3042 my ($self, @children) = @_; 3059 my ($self, @children) = @_;
… …
3048 $child->{x} = int $child->{x}; 3065 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y}; 3066 $child->{y} = int $child->{y};
3050 } 3067 }
3051 3068
3052 $self->SUPER::add (@children); 3069 $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
3059} 3070}
3060 3071
3061sub remove { 3072sub remove {
3062 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
3063 3074
… …
3088 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
3089 $_->() 3100 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
3091 } 3102 }
3092 3103
3093 if ($self->{check_size}) { 3104 if ($self->{realloc}) {
3094 my @queue; 3105 my @queue;
3095 3106
3096 for (;;) { 3107 while () {
3097 if ($self->{check_size}) { 3108 if ($self->{realloc}) {
3098 #TODO use array-of-depth approach 3109 #TODO use array-of-depth approach
3099 3110
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3111 @queue = sort { $a->{visible} <=> $b->{visible} }
3101 @queue, values %{delete $self->{check_size}}; 3112 @queue, values %{delete $self->{realloc}};
3102 } 3113 }
3103 3114
3104 my $widget = pop @queue || last; 3115 my $widget = pop @queue || last;
3105 3116
3106 defined $widget->{visible} or last; # do not resize invisible widgets 3117 $widget->{visible} or last; # do not resize invisible widgets
3107 3118
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h} 3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)} 3120 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request; 3121 : $widget->size_request;
3111 3122
3112 if (delete $widget->{force_alloc}
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115 3124
3116 $widget->{req_w} = $w; 3125 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3126 $widget->{req_h} = $h;
3118 3127
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3120 3129
3121 $widget->{parent}->check_size 3130 push @queue, $widget->{parent}
3122 if $widget->{parent}; 3131 if $widget->{parent};
3123 }
3124 } 3132 }
3125 } 3133 }
3126 3134
3127 while ($self->{size_alloc}) { 3135 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for ( 3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} } 3137 values %$size_alloc;
3130 values %{delete $self->{size_alloc}} 3138
3131 ) { 3139 while () {
3132 my ($widget, $w, $h) = @$_; 3140 my ($widget, $w, $h) = @{ pop @queue or last };
3133 3141
3134 $w = 0 if $w < 0; 3142 $w = 0 if $w < 0;
3135 $h = 0 if $h < 0; 3143 $h = 0 if $h < 0;
3136 3144
3137 $widget->{w} = $w; 3145 $widget->{w} = $w;
3138 $widget->{h} = $h; 3146 $widget->{h} = $h;
3139 $widget->emit (size_allocate => $w, $h); 3147 $widget->emit (size_allocate => $w, $h, 1);
3140 } 3148 }
3141 } 3149 }
3142 3150
3143 while ($self->{post_alloc_hook}) { 3151 while ($self->{post_alloc_hook}) {
3144 $_->() 3152 $_->()

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines