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

Diff Legend

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