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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.190 by root, Mon May 8 22:17:38 2006 UTC

… …
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
39 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
40} 48}
41 49
42# class methods for events 50# class methods for events
43sub feed_sdl_key_down_event { 51sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
53 if $FOCUS;
45} 54}
46 55
47sub feed_sdl_key_up_event { 56sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
58 if $FOCUS;
49} 59}
50 60
51sub feed_sdl_button_down_event { 61sub feed_sdl_button_down_event {
52 my ($ev) = @_; 62 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 63 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 71 check_tooltip;
62 } 72 }
63 73
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 74 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 75
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 76 if ($GRAB) {
77 ($x, $y) = $GRAB->coord2local ($x, $y);
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
67} 80}
68 81
69sub feed_sdl_button_up_event { 82sub feed_sdl_button_up_event {
70 my ($ev) = @_; 83 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
72 85
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 86 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 87
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 89
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 90 if ($GRAB) {
91 ($x, $y) = $GRAB->coord2local ($x, $y);
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
78 94
79 if (!$BUTTON_STATE) { 95 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 96 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 97 $grab->update if $grab;
82 $GRAB->update if $GRAB; 98 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 114 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 115
100 check_tooltip; 116 check_tooltip;
101 } 117 }
102 118
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122 }
104} 123}
105 124
106# convert position array to integers 125# convert position array to integers
107sub harmonize { 126sub harmonize {
108 my ($vals) = @_; 127 my ($vals) = @_;
… …
126 145
127sub new { 146sub new {
128 my $class = shift; 147 my $class = shift;
129 148
130 my $self = bless { 149 my $self = bless {
131 x => 0, 150 x => 0,
132 y => 0, 151 y => 0,
133 z => 0, 152 z => 0,
134 can_events => 1, 153 can_events => 1,
135 @_ 154 @_
136 }, $class; 155 }, $class;
137 156
138 for (keys %$self) { 157 for (keys %$self) {
… …
160} 179}
161 180
162sub hide { 181sub hide {
163 my ($self) = @_; 182 my ($self) = @_;
164 183
165 return unless $self->{parent}; 184 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self;
166 186
167 $self->{parent}->remove ($self); 187 $self->{parent}->remove ($self)
188 if $self->{parent};
168} 189}
169 190
170sub move { 191sub move {
171 my ($self, $x, $y, $z) = @_; 192 my ($self, $x, $y, $z) = @_;
172 193
… …
216 $self->{w} = $w; 237 $self->{w} = $w;
217 $self->{h} = $h; 238 $self->{h} = $h;
218 239
219 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
220 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
221 } 243 }
222} 244}
223 245
224sub size_allocate { 246sub size_allocate {
225 # nothing to be done 247 # nothing to be done
248}
249
250sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
226} 263}
227 264
228sub set_max_size { 265sub set_max_size {
229 my ($self, $w, $h) = @_; 266 my ($self, $w, $h) = @_;
230 267
… …
233} 270}
234 271
235# return top left coordinates 272# return top left coordinates
236sub _topleft { 273sub _topleft {
237 my ($self, $x, $y) = @_; 274 my ($self, $x, $y) = @_;
275
276 $self->{parent}
277 or Carp::confess "no parent widget in _topleft\n";#d#
238 278
239 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
240} 280}
241 281
242# translate global coordinates to local coordinate system 282# translate global coordinates to local coordinate system
… …
363} 403}
364 404
365sub check_size { 405sub check_size {
366 my ($self) = @_; 406 my ($self) = @_;
367 407
408 $self->_check_size;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self};
428
368 $self->{parent} 429 $self->{parent}
369 or return 1; 430 or return 1;
370 431
371 my ($w, $h) = $self->{user_w} && $self->{user_h} 432 my ($w, $h) = $self->{user_w} && $self->{user_h}
372 ? @$self{qw(user_w user_h)} 433 ? @$self{qw(user_w user_h)}
… …
374 435
375 if ($w != $self->{req_w} || $h != $self->{req_h}) { 436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
376 $self->{req_w} = $w; 437 $self->{req_w} = $w;
377 $self->{req_h} = $h; 438 $self->{req_h} = $h;
378 439
379 $self->{parent}->check_size 440 $self->{parent}->_check_size
380 or $self->size_allocate ( 441 or $self->size_allocate (
381 (List::Util::max $self->{w}, $w), 442 (List::Util::max $self->{w}, $w),
382 (List::Util::max $self->{h}, $h), 443 (List::Util::max $self->{h}, $h),
383 ); 444 );
384 445
… …
389} 450}
390 451
391sub update { 452sub update {
392 my ($self) = @_; 453 my ($self) = @_;
393 454
394 $self->{parent}->update 455 my $update = $CFClient::UI::ROOT->{_update} ||= {};
395 if $self->{parent}; 456
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
396} 468}
397 469
398sub connect { 470sub connect {
399 my ($self, $signal, $cb) = @_; 471 my ($self, $signal, $cb) = @_;
400 472
… …
402} 474}
403 475
404sub emit { 476sub emit {
405 my ($self, $signal, @args) = @_; 477 my ($self, $signal, @args) = @_;
406 478
407 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408 $cb->($self, @args);
409 }
410} 480}
411 481
412sub DESTROY { 482sub DESTROY {
413 my ($self) = @_; 483 my ($self) = @_;
414 484
… …
481sub new { 551sub new {
482 my ($class, %arg) = @_; 552 my ($class, %arg) = @_;
483 553
484 my $children = delete $arg{children} || []; 554 my $children = delete $arg{children} || [];
485 555
486 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 556 my $self = $class->SUPER::new (
557 children => [],
558 can_events => 0,
559 %arg,
560 );
487 $self->add ($_) for @$children; 561 $self->add ($_) for @$children;
488 562
489 $self 563 $self
490} 564}
491 565
492sub add { 566sub add {
493 my ($self, $child) = @_; 567 my ($self, @widgets) = @_;
494 568
495 $child->set_parent ($self); 569 $_->set_parent ($self)
570 for @widgets;
496 571
497 use sort 'stable'; 572 use sort 'stable';
498 573
499 $self->{children} = [ 574 $self->{children} = [
500 sort { $a->{z} <=> $b->{z} } 575 sort { $a->{z} <=> $b->{z} }
501 @{$self->{children}}, $child 576 @{$self->{children}}, @widgets
502 ]; 577 ];
503 578
504 $child->check_size; 579 $_->check_size
580 for @widgets;
581
582 $self->update;
583}
584
585sub children {
586 @{ $_[0]{children} }
505} 587}
506 588
507sub remove { 589sub remove {
508 my ($self, $child) = @_; 590 my ($self, $child) = @_;
509 591
510 delete $child->{parent}; 592 delete $child->{parent};
593 $child->hide;
511 594
512 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513 596
514 $self->check_size; 597 $self->check_size;
515 $self->update; 598 $self->update;
516} 599}
517 600
518sub clear { 601sub clear {
519 my ($self) = @_; 602 my ($self) = @_;
520 603
521 delete $_->{parent} 604 my $children = delete $self->{children};
522 for @{ delete $self->{children} };
523
524 $self->{children} = []; 605 $self->{children} = [];
606
607 for (@$children) {
608 delete $_->{parent};
609 $_->hide;
610 }
611
612 $self->check_size;
613 $self->update;
525} 614}
526 615
527sub find_widget { 616sub find_widget {
528 my ($self, $x, $y) = @_; 617 my ($self, $x, $y) = @_;
529 618
… …
604} 693}
605 694
606sub update { 695sub update {
607 my ($self) = @_; 696 my ($self) = @_;
608 697
609 # we want to do this delayed... 698 $ROOT->on_refresh ($self => sub { $self->render_child });
610 $self->render_chld;
611 $self->SUPER::update; 699 $self->SUPER::update;
612}
613
614sub render_chld {
615 my ($self) = @_;
616
617 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618 glClearColor 0, 0, 0, 1;
619 glClear GL_COLOR_BUFFER_BIT;
620 $self->child->draw;
621 };
622} 700}
623 701
624sub size_allocate { 702sub size_allocate {
625 my ($self, $w, $h) = @_; 703 my ($self, $w, $h) = @_;
626 704
627 $self->child->configure (0, 0, $w, $h); 705 $self->SUPER::size_allocate ($w, $h);
706 $self->update;
707}
628 708
709sub _render {
710 $_[0]{children}[0]->draw;
711}
712
713sub render_child {
714 my ($self) = @_;
715
716 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
717 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT;
719
629 $self->render_chld; 720 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 };
630} 729}
631 730
632sub _draw { 731sub _draw {
633 my ($self) = @_; 732 my ($self) = @_;
634 733
… …
636 735
637 my $tex = $self->{texture} 736 my $tex = $self->{texture}
638 or return; 737 or return;
639 738
640 glEnable GL_BLEND; 739 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 741 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1;
644 744
645 $tex->draw_quad (0, 0, $w, $h); 745 $tex->draw_quad (0, 0, $w, $h);
646 746
647 glDisable GL_BLEND; 747 glDisable GL_BLEND;
648 glDisable GL_TEXTURE_2D; 748 glDisable GL_TEXTURE_2D;
… …
652 752
653package CFClient::UI::ViewPort; 753package CFClient::UI::ViewPort;
654 754
655our @ISA = CFClient::UI::Window::; 755our @ISA = CFClient::UI::Window::;
656 756
657sub new { die }
658
659sub size_request { 757sub size_request {
660 my ($self) = @_; 758 my ($self) = @_;
661 759
662 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
664 762
665 @$self{qw(child_w child_h)} 763 @$self{qw(child_w child_h)}
666} 764}
667 765
668sub _draw { 766sub size_allocate {
669 my ($self) = @_; 767 my ($self, $w, $h) = @_;
670 768
671 $self->{children}[1]->draw; 769 $self->update;
672} 770}
673 771
772sub set_offset {
773 my ($self, $x, $y) = @_;
774
775 $self->{view_x} = int $x;
776 $self->{view_y} = int $y;
777
778 $self->update;
779}
780
781# hmm, this does not work for topleft of $self... but we should not aks for that
782sub _topleft {
783 my ($self, $x, $y) = @_;
784
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
786}
787
788sub find_widget {
789 my ($self, $x, $y) = @_;
790
791 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
792 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
793 ) {
794 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
795 } else {
796 $self->CFClient::UI::Base::find_widget ($x, $y)
797 }
798}
799
800sub _render {
801 my ($self) = @_;
802
803 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
804
805 $self->SUPER::_render;
806}
807
808#############################################################################
809
810package CFClient::UI::ScrolledWindow;
811
812our @ISA = CFClient::UI::HBox::;
813
814sub new {
815 my $class = shift;
816
817 my $self;
818
819 my $slider = new CFClient::UI::Slider
820 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
824 },
825 ;
826
827 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort),
829 slider => $slider,
830 @_,
831 );
832
833 $self->{vp}->add ($self->{scrolled});
834 $self->add ($self->{vp});
835 $self->add ($self->{slider});
836
837 $self
838}
839
840#TODO# update range on size_allocate depeneing on child
841# update viewport offset on scroll
674 842
675############################################################################# 843#############################################################################
676 844
677package CFClient::UI::Frame; 845package CFClient::UI::Frame;
678 846
… …
733 my $class = shift; 901 my $class = shift;
734 902
735 # TODO: user_x, user_y, overwrite moveto? 903 # TODO: user_x, user_y, overwrite moveto?
736 904
737 my $self = $class->SUPER::new ( 905 my $self = $class->SUPER::new (
738 bg => [1, 1, 1, 1], 906 bg => [1, 1, 1, 1],
739 border_bg => [1, 1, 1, 1], 907 border_bg => [1, 1, 1, 1],
740 border => 0.8, 908 border => 0.6,
741 can_events => 1, 909 can_events => 1,
742 @_ 910 @_
743 ); 911 );
744 912
745 $self->{title} &&= new CFClient::UI::Label 913 $self->{title} &&= new CFClient::UI::Label
746 align => 0, 914 align => 0,
747 valign => 1, 915 valign => 1,
748 text => $self->{title}, 916 text => $self->{title},
749 fontsize => 1; 917 fontsize => $self->{border};
750 918
751 $self 919 $self
752} 920}
753 921
754sub border { 922sub border {
… …
779} 947}
780 948
781sub button_down { 949sub button_down {
782 my ($self, $ev, $x, $y) = @_; 950 my ($self, $ev, $x, $y) = @_;
783 951
952 my ($w, $h) = @$self{qw(w h)};
784 my $border = $self->border; 953 my $border = $self->border;
785 954
786 if ($x < $self->{w} && $x >= $self->{w} - $border 955 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787 && $y < $self->{h} && $y >= $self->{h} - $border) { 956 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788 957
958 if ($lr & $td) {
959 my ($wx, $wy) = ($self->{x}, $self->{y});
789 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 960 my ($ox, $oy) = ($ev->{x}, $ev->{y});
790 my ($bw, $bh) = ($self->{w}, $self->{h}); 961 my ($bw, $bh) = ($self->{w}, $self->{h});
791 962
963 my $mx = $x < $border;
964 my $my = $y < $border;
965
792 $self->{motion} = sub { 966 $self->{motion} = sub {
793 my ($ev, $x, $y) = @_; 967 my ($ev, $x, $y) = @_;
794 968
795 ($x, $y) = ($ev->{x}, $ev->{y}); 969 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy;
796 971
797 $self->{user_w} = $bw + $x - $ox; 972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798 $self->{user_h} = $bh + $y - $oy; 973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
799 $self->check_size; 975 $self->check_size;
800 }; 976 };
801 977
802 } elsif ($x >= 0 && $x < $self->{w} 978 } elsif ($lr ^ $td) {
803 && $y >= 0 && $y < $border) {
804
805 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 979 my ($ox, $oy) = ($ev->{x}, $ev->{y});
806 my ($bx, $by) = ($self->{x}, $self->{y}); 980 my ($bx, $by) = ($self->{x}, $self->{y});
807 981
808 $self->{motion} = sub { 982 $self->{motion} = sub {
809 my ($ev, $x, $y) = @_; 983 my ($ev, $x, $y) = @_;
… …
845 $tex[1]->draw_quad (0, 0, $w, $border); 1019 $tex[1]->draw_quad (0, 0, $w, $border);
846 $tex[3]->draw_quad (0, $border, $border, $ch); 1020 $tex[3]->draw_quad (0, $border, $border, $ch);
847 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
848 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1022 $tex[4]->draw_quad (0, $h - $border, $w, $border);
849 1023
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850 my $bg = $tex[0]; 1025 my $bg = $tex[0];
851 1026
852 # TODO: repeat texture not scale 1027 # TODO: repeat texture not scale
853 my $rep_x = $cw / $bg->{w}; 1028 my $rep_x = $cw / $bg->{w};
854 my $rep_y = $ch / $bg->{h}; 1029 my $rep_y = $ch / $bg->{h};
855 1030
856 glColor @{ $self->{bg} }; 1031 glColor @{ $self->{bg} };
857 1032
858 $bg->{s} = $rep_x; 1033 $bg->{s} = $rep_x;
859 $bg->{t} = $rep_y; 1034 $bg->{t} = $rep_y;
860 $bg->{wrap_mode} = 1; 1035 $bg->{wrap_mode} = 1;
861 $bg->draw_quad ($border, $border, $cw, $ch); 1036 $bg->draw_quad ($border, $border, $cw, $ch);
862 1037
863 glDisable GL_TEXTURE_2D; 1038 glDisable GL_TEXTURE_2D;
864 glDisable GL_BLEND; 1039 glDisable GL_BLEND;
1040 }
865 1041
866 $self->{title}->draw if $self->{title}; 1042 $self->{title}->draw if $self->{title};
1043
867 $self->child->draw; 1044 $self->child->draw;
868} 1045}
869 1046
870############################################################################# 1047#############################################################################
871 1048
… …
893 $self->{children}[$y][$x] = $child; 1070 $self->{children}[$y][$x] = $child;
894 1071
895 $child->check_size; 1072 $child->check_size;
896} 1073}
897 1074
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
898# TODO: move to container class maybe? send childs a signal on removal? 1079# TODO: move to container class maybe? send childs a signal on removal?
899sub clear { 1080sub clear {
900 my ($self) = @_; 1081 my ($self) = @_;
901 1082
1083 my @children = $self->children;
902 delete $self->{children}; 1084 delete $self->{children};
1085
1086 for (@children) {
1087 delete $_->{parent};
1088 $_->hide;
1089 }
1090
903 $self->update; 1091 $self->update;
904} 1092}
905 1093
906sub get_wh { 1094sub get_wh {
907 my ($self) = @_; 1095 my ($self) = @_;
… …
1130 1318
1131sub new { 1319sub new {
1132 my ($class, %arg) = @_; 1320 my ($class, %arg) = @_;
1133 1321
1134 my $self = $class->SUPER::new ( 1322 my $self = $class->SUPER::new (
1135 fg => [1, 1, 1], 1323 fg => [1, 1, 1],
1136 #font => default_font 1324 #font => default_font
1137 fontsize => 1, 1325 fontsize => 1,
1138 text => "", 1326 text => "",
1139 align => -1, 1327 align => -1,
1140 valign => -1, 1328 valign => -1,
1141 padding => 2, 1329 padding => 2,
1142 layout => new CFClient::Layout, 1330 layout => new CFClient::Layout,
1143 can_events => 0, 1331 can_events => 0,
1144 %arg 1332 %arg
1145 ); 1333 );
1146 1334
1147 if (exists $self->{template}) { 1335 if (exists $self->{template}) {
… …
1164 s/</&lt;/g; 1352 s/</&lt;/g;
1165 1353
1166 $_[1] 1354 $_[1]
1167} 1355}
1168 1356
1357sub update {
1358 my ($self) = @_;
1359
1360 delete $self->{texture};
1361 $self->SUPER::update;
1362}
1363
1169sub set_text { 1364sub set_text {
1170 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1171 1366
1367 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text";
1369
1172 $self->{layout}->set_text ($text); 1370 $self->{layout}->set_text ($text);
1173 1371
1174 delete $self->{texture}; 1372 delete $self->{texture};
1373 $self->update;
1175 $self->check_size; 1374 $self->check_size;
1176 $self->update;
1177} 1375}
1178 1376
1179sub set_markup { 1377sub set_markup {
1180 my ($self, $markup) = @_; 1378 my ($self, $markup) = @_;
1181 1379
1380 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup";
1382
1182 $self->{layout}->set_markup ($markup); 1383 $self->{layout}->set_markup ($markup);
1183 1384
1184 delete $self->{texture}; 1385 delete $self->{texture};
1386 $self->update;
1185 $self->check_size; 1387 $self->check_size;
1186 $self->update;
1187} 1388}
1188 1389
1189sub size_request { 1390sub size_request {
1190 my ($self) = @_; 1391 my ($self) = @_;
1191 1392
… …
1220sub set_fontsize { 1421sub set_fontsize {
1221 my ($self, $fontsize) = @_; 1422 my ($self, $fontsize) = @_;
1222 1423
1223 $self->{fontsize} = $fontsize; 1424 $self->{fontsize} = $fontsize;
1224 delete $self->{texture}; 1425 delete $self->{texture};
1426
1427 $self->update;
1225 $self->check_size; 1428 $self->check_size;
1226 $self->update;
1227} 1429}
1228 1430
1229sub _draw { 1431sub _draw {
1230 my ($self) = @_; 1432 my ($self) = @_;
1231 1433
… …
1271 1473
1272sub new { 1474sub new {
1273 my $class = shift; 1475 my $class = shift;
1274 1476
1275 $class->SUPER::new ( 1477 $class->SUPER::new (
1276 fg => [1, 1, 1], 1478 fg => [1, 1, 1],
1277 bg => [0, 0, 0, 0.2], 1479 bg => [0, 0, 0, 0.2],
1278 active_bg => [1, 1, 1, 0.5], 1480 active_bg => [1, 1, 1, 0.5],
1279 active_fg => [0, 0, 0], 1481 active_fg => [0, 0, 0],
1280 can_hover => 1, 1482 can_hover => 1,
1281 can_focus => 1, 1483 can_focus => 1,
1282 valign => 0, 1484 valign => 0,
1283 can_events => 1, 1485 can_events => 1,
1284 @_ 1486 @_
1285 ) 1487 )
1286} 1488}
1287 1489
… …
1441 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1442 1644
1443 my $sym = $ev->{sym}; 1645 my $sym = $ev->{sym};
1444 1646
1445 if ($sym == 13) { 1647 if ($sym == 13) {
1648 unshift @{$self->{history}},
1649 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = '';
1446 $self->emit (activate => $self->get_text); 1652 $self->emit (activate => $txt);
1447 $self->update; 1653 $self->update;
1654
1655 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text;
1658 }
1659 if (@{$self->{history} || []} > 0) {
1660 $self->{history_pointer}++;
1661 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1662 $self->{history_pointer} = @{$self->{history} || []} - 1;
1663 }
1664 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1665 }
1666
1667 } elsif ($sym == CFClient::SDLK_DOWN) {
1668 $self->{history_pointer}--;
1669 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1670
1671 if ($self->{history_pointer} >= 0) {
1672 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1673 } else {
1674 $self->set_text ($self->{history_saveback});
1675 }
1448 1676
1449 } else { 1677 } else {
1450 $self->SUPER::key_down ($ev); 1678 $self->SUPER::key_down ($ev);
1451 } 1679 }
1452 1680
… …
1466 1694
1467sub new { 1695sub new {
1468 my $class = shift; 1696 my $class = shift;
1469 1697
1470 $class->SUPER::new ( 1698 $class->SUPER::new (
1471 padding => 4, 1699 padding => 4,
1472 fg => [1, 1, 1], 1700 fg => [1, 1, 1],
1473 bg => [1, 1, 1, 0.2], 1701 bg => [1, 1, 1, 0.2],
1474 active_fg => [0, 0, 1], 1702 active_fg => [0, 0, 1],
1475 can_hover => 1, 1703 can_hover => 1,
1476 align => 0, 1704 align => 0,
1477 valign => 0, 1705 valign => 0,
1478 can_events => 1, 1706 can_events => 1,
1479 @_ 1707 @_
1480 ) 1708 )
1481} 1709}
1482 1710
… …
1689} 1917}
1690 1918
1691sub set_max { 1919sub set_max {
1692 my ($self, $max) = @_; 1920 my ($self, $max) = @_;
1693 1921
1922 return if $self->{max_val} == $max;
1923
1694 $self->{max_val} = $max; 1924 $self->{max_val} = $max;
1925 $self->update;
1695} 1926}
1696 1927
1697sub set_value { 1928sub set_value {
1698 my ($self, $val, $max) = @_; 1929 my ($self, $val, $max) = @_;
1699 1930
1700 $self->set_max ($max) 1931 $self->set_max ($max)
1701 if defined $max; 1932 if defined $max;
1702 1933
1703 $max = $self->{max_val}; 1934 return if $self->{val} == $val;
1935
1704 $self->{val} = $val; 1936 $self->{val} = $val;
1705
1706 $self->update; 1937 $self->update;
1707} 1938}
1708 1939
1709sub _draw { 1940sub _draw {
1710 my ($self) = @_; 1941 my ($self) = @_;
… …
1773 2004
1774sub new { 2005sub new {
1775 my ($class, %arg) = @_; 2006 my ($class, %arg) = @_;
1776 2007
1777 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1778 tooltip => $arg{type}, 2009 tooltip => $arg{type},
2010 can_hover => 1,
1779 can_events => 1, 2011 can_events => 1,
1780 can_hover => 1,
1781 %arg, 2012 %arg,
1782 ); 2013 );
1783 2014
1784 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2015 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2016 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
… …
1793 2024
1794 $self->{value}->set_fontsize ($fsize); 2025 $self->{value}->set_fontsize ($fsize);
1795 $self->{max} ->set_fontsize ($fsize); 2026 $self->{max} ->set_fontsize ($fsize);
1796} 2027}
1797 2028
2029sub set_max {
2030 my ($self, $max) = @_;
2031
2032 $self->{gauge}->set_max ($max);
2033 $self->{max}->set_text ($max);
2034}
2035
1798sub set_value { 2036sub set_value {
1799 my ($self, $val, $max) = @_; 2037 my ($self, $val, $max) = @_;
1800 2038
1801 $self->set_max ($max) 2039 $self->set_max ($max)
1802 if defined $max; 2040 if defined $max;
1803 2041
1804 $self->{gauge}->set_value ($val, $max); 2042 $self->{gauge}->set_value ($val, $max);
1805 $self->{value}->set_text ($val); 2043 $self->{value}->set_text ($val);
1806}
1807
1808sub set_max {
1809 my ($self, $max) = @_;
1810
1811 $self->{gauge}->set_max ($max);
1812 $self->{max}->set_text ($max);
1813} 2044}
1814 2045
1815############################################################################# 2046#############################################################################
1816 2047
1817package CFClient::UI::Slider; 2048package CFClient::UI::Slider;
… …
1836 # TODO: calculations are off 2067 # TODO: calculations are off
1837 my $self = $class->SUPER::new ( 2068 my $self = $class->SUPER::new (
1838 fg => [1, 1, 1], 2069 fg => [1, 1, 1],
1839 active_fg => [0, 0, 0], 2070 active_fg => [0, 0, 0],
1840 range => [0, 0, 100, 10], 2071 range => [0, 0, 100, 10],
1841 req_w => 20, 2072 req_w => $::WIDTH / 80,
1842 req_h => 20, 2073 req_h => $::WIDTH / 80,
1843 vertical => 0, 2074 vertical => 0,
1844 can_hover => 1, 2075 can_hover => 1,
1845 inner_pad => 5, 2076 inner_pad => 5,
1846 @_ 2077 @_
1847 ); 2078 );
… …
1957 2188
1958sub new { 2189sub new {
1959 my $class = shift; 2190 my $class = shift;
1960 2191
1961 my $self = $class->SUPER::new ( 2192 my $self = $class->SUPER::new (
1962 fontsize => 1, 2193 fontsize => 1,
2194 can_events => 0,
1963 #font => default_font 2195 #font => default_font
1964 @_, 2196 @_,
1965 2197
1966 layout => (new CFClient::Layout), 2198 layout => (new CFClient::Layout),
1967 par => [], 2199 par => [],
1968 height => 0, 2200 height => 0,
1969 children => [ 2201 children => [
1970 (new CFClient::UI::Empty expand => 1), 2202 (new CFClient::UI::Empty expand => 1),
1971 (new CFClient::UI::Slider vertical => 1), 2203 (new CFClient::UI::Slider vertical => 1),
1972 ], 2204 ],
1973 ); 2205 );
1974 2206
1975 $self->{children}[1]->connect (changed => sub { 2207 $self->{children}[1]->connect (changed => sub { $self->update });
1976 $self->update;
1977 });
1978 2208
1979 $self 2209 $self
1980} 2210}
1981 2211
1982sub set_fontsize { 2212sub set_fontsize {
… …
1990 my ($self, $text) = @_; 2220 my ($self, $text) = @_;
1991 2221
1992 my $layout = $self->{layout}; 2222 my $layout = $self->{layout};
1993 2223
1994 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995 $layout->set_width ($self->{w}); 2225 $layout->set_width ($self->{children}[0]{w});
1996 $layout->set_text ($text); 2226 $layout->set_text ($text);
1997 2227
1998 ($layout->size)[1] 2228 ($layout->size)[1]
1999} 2229}
2000 2230
… …
2053 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054 2284
2055 delete $self->{texture}; 2285 delete $self->{texture};
2056 } 2286 }
2057 2287
2058 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059 glClearColor 0, 0, 0, 1; 2289 glClearColor 0, 0, 0, 0;
2060 glClear GL_COLOR_BUFFER_BIT; 2290 glClear GL_COLOR_BUFFER_BIT;
2061 2291
2062 glEnable GL_BLEND; 2292 glEnable GL_BLEND;
2063 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
… …
2096} 2326}
2097 2327
2098sub _draw { 2328sub _draw {
2099 my ($self) = @_; 2329 my ($self) = @_;
2100 2330
2101 if ($self->{texture}) { 2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2102 glEnable GL_TEXTURE_2D; 2333 glEnable GL_TEXTURE_2D;
2103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1;
2104 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105 glDisable GL_TEXTURE_2D; 2337 glDisable GL_TEXTURE_2D;
2106 } 2338 glDisable GL_BLEND;
2107 2339
2108 $self->{children}[1]->draw; 2340 $self->{children}[1]->draw;
2109 2341
2110} 2342}
2111 2343
… …
2159 2391
2160sub new { 2392sub new {
2161 my $class = shift; 2393 my $class = shift;
2162 2394
2163 my $self = $class->SUPER::new ( 2395 my $self = $class->SUPER::new (
2164 state => 0, 2396 state => 0,
2165 connect_activate => \&toggle_flopper, 2397 connect_activate => \&toggle_flopper,
2166 can_events => 1,
2167 @_ 2398 @_
2168 ); 2399 );
2169 2400
2170 if ($self->{state}) { 2401 if ($self->{state}) {
2171 $self->{state} = 0; 2402 $self->{state} = 0;
… …
2281 2512
2282sub size_request { 2513sub size_request {
2283 (32, 8) 2514 (32, 8)
2284} 2515}
2285 2516
2286sub draw { 2517sub _draw {
2287 my ($self) = @_; 2518 my ($self) = @_;
2288 2519
2520 return unless $::CONN;#d# manage and cache textures differently
2289 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290 2522
2523 # TODO animation
2291 if ($tex) { 2524 if ($tex) {
2292 glEnable GL_BLEND; 2525 glEnable GL_BLEND;
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D; 2527 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2300 } 2533 }
2301} 2534}
2302 2535
2303############################################################################# 2536#############################################################################
2304 2537
2538package CFClient::UI::InventoryItem;
2539
2540our @ISA = CFClient::UI::HBox::;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new (
2555 can_hover => 1,
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_,
2610 );
2611
2612 $self
2613}
2614
2615sub set_items {
2616 my ($self, $items) = @_;
2617
2618 $self->{scrolled}->clear;
2619 return unless $items;
2620
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2622
2623 $self->{real_items} = \@items;
2624
2625 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2631 }
2632
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h});
2639}
2640
2641#############################################################################
2642
2643package CFClient::UI::Menu;
2644
2645our @ISA = CFClient::UI::FancyFrame::;
2646
2647use CFClient::OpenGL;
2648
2649sub new {
2650 my $class = shift;
2651
2652 my $self = $class->SUPER::new (
2653 items => [],
2654 z => 100,
2655 @_,
2656 );
2657
2658 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2659
2660 for my $item (@{ $self->{items} }) {
2661 my ($widget, $cb) = @$item;
2662
2663 # handle various types of items, only text for now
2664 if (!ref $widget) {
2665 $widget = new CFClient::UI::Label
2666 can_hover => 1,
2667 can_events => 1,
2668 text => $widget;
2669 }
2670
2671 $self->{item}{$widget} = $item;
2672
2673 $self->{vbox}->add ($widget);
2674 }
2675
2676 $self
2677}
2678
2679# popup given the event (must be a mouse button down event currently)
2680sub popup {
2681 my ($self, $ev) = @_;
2682
2683 $self->emit ("popdown");
2684
2685 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self;
2687 $self->{button} = $ev->{button};
2688
2689 $self->show;
2690 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2691}
2692
2693sub mouse_motion {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # TODO: should use vbox->find_widget or so
2697 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2698 $self->{hover} = $self->{item}{$HOVER};
2699}
2700
2701sub button_up {
2702 my ($self, $ev, $x, $y) = @_;
2703
2704 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB;
2706 $self->hide;
2707
2708 $self->emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover};
2710 }
2711}
2712
2713#############################################################################
2714
2305package CFClient::UI::Root; 2715package CFClient::UI::Root;
2306 2716
2307our @ISA = CFClient::UI::Container::; 2717our @ISA = CFClient::UI::Container::;
2308 2718
2309use CFClient::OpenGL; 2719use CFClient::OpenGL;
2310 2720
2311sub check_size { 2721sub check_size {
2312 my ($self) = @_; 2722 my ($self) = @_;
2313 2723
2314 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2724 $self->configure (0, 0, $self->{w}, $self->{h});
2315} 2725}
2316 2726
2317sub size_request { 2727sub size_request {
2318 ($::WIDTH, $::HEIGHT) 2728 my ($self) = @_;
2729
2730 ($self->{w}, $self->{h})
2731}
2732
2733sub size_allocate {
2734 my ($self, $w, $h) = @_;
2735
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2319} 2754}
2320 2755
2321sub configure { 2756sub configure {
2322 my ($self, $x, $y, $w, $h) = @_; 2757 my ($self, $x, $y, $w, $h) = @_;
2323 2758
2324 $self->SUPER::configure ($x, $y, $w, $h); 2759 $self->SUPER::configure ($x, $y, $w, $h);
2325 2760
2326 for my $child (@{$self->{children}}) { 2761 for my $child ($self->children) {
2327 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2762 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328 2763
2329 $X = List::Util::max 0, List::Util::min $w - $W, $X; 2764 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2330 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 2765 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2331 $child->configure ($X, $Y, $W,$H); 2766 $child->configure ($X, $Y, $W, $H);
2332 } 2767 }
2333} 2768}
2334 2769
2335sub _topleft { 2770sub _topleft {
2336 my ($self, $x, $y) = @_; 2771 my ($self, $x, $y) = @_;

Diff Legend

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