… | |
… | |
5 | |
5 | |
6 | use Scalar::Util (); |
6 | use Scalar::Util (); |
7 | use List::Util (); |
7 | use List::Util (); |
8 | |
8 | |
9 | use CFClient; |
9 | use CFClient; |
|
|
10 | use CFClient::Texture; |
10 | |
11 | |
11 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | |
13 | |
13 | our $ROOT; |
14 | our $ROOT; |
14 | our $TOOLTIP; |
15 | our $TOOLTIP; |
… | |
… | |
50 | delete $TOOLTIP->{owner}; |
51 | delete $TOOLTIP->{owner}; |
51 | } |
52 | } |
52 | |
53 | |
53 | # class methods for events |
54 | # class methods for events |
54 | sub feed_sdl_key_down_event { |
55 | sub feed_sdl_key_down_event { |
55 | $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) |
56 | $FOCUS->emit (key_down => $_[0]) |
56 | if $FOCUS; |
57 | if $FOCUS; |
57 | } |
58 | } |
58 | |
59 | |
59 | sub feed_sdl_key_up_event { |
60 | sub feed_sdl_key_up_event { |
60 | $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) |
61 | $FOCUS->emit (key_up => $_[0]) |
61 | if $FOCUS; |
62 | if $FOCUS; |
62 | } |
63 | } |
63 | |
64 | |
64 | sub feed_sdl_button_down_event { |
65 | sub feed_sdl_button_down_event { |
65 | my ($ev) = @_; |
66 | my ($ev) = @_; |
… | |
… | |
74 | check_tooltip; |
75 | check_tooltip; |
75 | } |
76 | } |
76 | |
77 | |
77 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
78 | $BUTTON_STATE |= 1 << ($ev->{button} - 1); |
78 | |
79 | |
79 | if ($GRAB) { |
80 | $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) |
80 | ($x, $y) = $GRAB->coord2local ($x, $y); |
81 | if $GRAB; |
81 | $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); |
|
|
82 | } |
|
|
83 | } |
82 | } |
84 | |
83 | |
85 | sub feed_sdl_button_up_event { |
84 | sub feed_sdl_button_up_event { |
86 | my ($ev) = @_; |
85 | my ($ev) = @_; |
87 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
86 | my ($x, $y) = ($ev->{x}, $ev->{y}); |
88 | |
87 | |
89 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
88 | my $widget = $GRAB || $ROOT->find_widget ($x, $y); |
90 | |
89 | |
91 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
90 | $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); |
92 | |
91 | |
93 | if ($GRAB) { |
92 | $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) |
94 | ($x, $y) = $GRAB->coord2local ($x, $y); |
93 | if $GRAB; |
95 | $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y); |
|
|
96 | } |
|
|
97 | |
94 | |
98 | if (!$BUTTON_STATE) { |
95 | if (!$BUTTON_STATE) { |
99 | my $grab = $GRAB; undef $GRAB; |
96 | my $grab = $GRAB; undef $GRAB; |
100 | $grab->update if $grab; |
97 | $grab->update if $grab; |
101 | $GRAB->update if $GRAB; |
98 | $GRAB->update if $GRAB; |
… | |
… | |
117 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
114 | $HOVER->update if $HOVER && $HOVER->{can_hover}; |
118 | |
115 | |
119 | check_tooltip; |
116 | check_tooltip; |
120 | } |
117 | } |
121 | |
118 | |
122 | if ($HOVER) { |
|
|
123 | ($x, $y) = $HOVER->coord2local ($x, $y); |
|
|
124 | $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); |
119 | $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) |
125 | } |
120 | if $HOVER; |
126 | } |
121 | } |
127 | |
122 | |
128 | # convert position array to integers |
123 | # convert position array to integers |
129 | sub harmonize { |
124 | sub harmonize { |
130 | my ($vals) = @_; |
125 | my ($vals) = @_; |
… | |
… | |
144 | |
139 | |
145 | $_->update |
140 | $_->update |
146 | for @widgets; |
141 | for @widgets; |
147 | } |
142 | } |
148 | |
143 | |
|
|
144 | sub reconfigure_widgets { |
|
|
145 | # make a copy, otherwise C<for> complains about freed values. |
|
|
146 | my @widgets = values %WIDGET; |
|
|
147 | |
|
|
148 | $_->reconfigure |
|
|
149 | for @widgets; |
|
|
150 | } |
|
|
151 | |
149 | # call when resolution changes etc. |
152 | # call when resolution changes etc. |
150 | sub rescale_widgets { |
153 | sub rescale_widgets { |
151 | my ($sx, $sy) = @_; |
154 | my ($sx, $sy) = @_; |
152 | |
155 | |
153 | # make a copy, otherwise for complains about freed values. |
|
|
154 | my @widgets = values %WIDGET; |
156 | for my $widget (values %WIDGET) { |
155 | |
|
|
156 | for my $widget (@widgets) { |
|
|
157 | if ($widget->{toplevel}) { |
157 | if ($widget->{is_toplevel}) { |
158 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
158 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
159 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
159 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
160 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
160 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
161 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
161 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
162 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
162 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
163 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
163 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
164 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
164 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
165 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
165 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
166 | } |
166 | } |
167 | |
|
|
168 | $widget->reconfigure; |
|
|
169 | } |
167 | } |
|
|
168 | |
|
|
169 | reconfigure_widgets; |
170 | } |
170 | } |
171 | |
171 | |
172 | ############################################################################# |
172 | ############################################################################# |
173 | |
173 | |
174 | package CFClient::UI::Base; |
174 | package CFClient::UI::Base; |
… | |
… | |
224 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
224 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
225 | }, |
225 | }, |
226 | ); |
226 | ); |
227 | } |
227 | } |
228 | |
228 | |
229 | sub hide { |
229 | sub set_invisible { |
230 | my ($self) = @_; |
230 | my ($self) = @_; |
|
|
231 | |
|
|
232 | # broken show/hide model |
|
|
233 | |
|
|
234 | delete $self->{root}; |
|
|
235 | delete $self->{visible}; |
231 | |
236 | |
232 | undef $GRAB if $GRAB == $self; |
237 | undef $GRAB if $GRAB == $self; |
233 | undef $HOVER if $HOVER == $self; |
238 | undef $HOVER if $HOVER == $self; |
|
|
239 | |
|
|
240 | CFClient::UI::check_tooltip |
|
|
241 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
|
|
242 | |
|
|
243 | $self->focus_out; |
|
|
244 | } |
|
|
245 | |
|
|
246 | sub hide { |
|
|
247 | my ($self) = @_; |
|
|
248 | |
|
|
249 | $self->set_invisible; |
234 | |
250 | |
235 | $self->{parent}->remove ($self) |
251 | $self->{parent}->remove ($self) |
236 | if $self->{parent}; |
252 | if $self->{parent}; |
237 | } |
253 | } |
238 | |
254 | |
… | |
… | |
308 | } |
324 | } |
309 | |
325 | |
310 | sub set_tooltip { |
326 | sub set_tooltip { |
311 | my ($self, $tooltip) = @_; |
327 | my ($self, $tooltip) = @_; |
312 | |
328 | |
|
|
329 | $tooltip =~ s/^\s+//; |
|
|
330 | $tooltip =~ s/\s+$//; |
|
|
331 | |
|
|
332 | return if $self->{tooltip} eq $tooltip; |
|
|
333 | |
313 | $self->{tooltip} = $tooltip; |
334 | $self->{tooltip} = $tooltip; |
314 | |
335 | |
315 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
336 | if ($CFClient::UI::TOOLTIP->{owner} == $self) { |
316 | delete $CFClient::UI::TOOLTIP->{owner}; |
337 | delete $CFClient::UI::TOOLTIP->{owner}; |
317 | CFClient::UI::check_tooltip; |
338 | CFClient::UI::check_tooltip; |
… | |
… | |
338 | return if $FOCUS == $self; |
359 | return if $FOCUS == $self; |
339 | return unless $self->{can_focus}; |
360 | return unless $self->{can_focus}; |
340 | |
361 | |
341 | my $focus = $FOCUS; $FOCUS = $self; |
362 | my $focus = $FOCUS; $FOCUS = $self; |
342 | |
363 | |
343 | $self->emit (focus_in => $focus); |
364 | $self->_emit (focus_in => $focus); |
344 | |
365 | |
345 | $focus->update if $focus; |
366 | $focus->update if $focus; |
346 | $FOCUS->update; |
367 | $FOCUS->update; |
347 | } |
368 | } |
348 | |
369 | |
… | |
… | |
351 | |
372 | |
352 | return unless $FOCUS == $self; |
373 | return unless $FOCUS == $self; |
353 | |
374 | |
354 | my $focus = $FOCUS; undef $FOCUS; |
375 | my $focus = $FOCUS; undef $FOCUS; |
355 | |
376 | |
356 | $self->emit (focus_out => $focus); |
377 | $self->_emit (focus_out => $focus); |
357 | |
378 | |
358 | $focus->update if $focus; #? |
379 | $focus->update if $focus; #? |
|
|
380 | |
|
|
381 | $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus |
|
|
382 | unless $FOCUS; |
359 | } |
383 | } |
360 | |
384 | |
361 | sub mouse_motion { } |
385 | sub mouse_motion { } |
362 | sub button_up { } |
386 | sub button_up { } |
363 | sub key_down { } |
387 | sub key_down { } |
364 | sub key_up { } |
388 | sub key_up { } |
365 | |
389 | |
366 | sub button_down { |
390 | sub button_down { |
367 | my ($self, $ev, $x, $y) = @_; |
391 | my ($self, $ev, $x, $y) = @_; |
368 | |
392 | |
369 | $self->focus_in; |
393 | $self->focus_in; |
… | |
… | |
403 | if ($ENV{PCLIENT_DEBUG}) { |
427 | if ($ENV{PCLIENT_DEBUG}) { |
404 | glPushMatrix; |
428 | glPushMatrix; |
405 | glColor 1, 1, 0, 1; |
429 | glColor 1, 1, 0, 1; |
406 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
430 | glTranslate $self->{x} + 0.375, $self->{y} + 0.375; |
407 | glBegin GL_LINE_LOOP; |
431 | glBegin GL_LINE_LOOP; |
408 | glVertex 0 , 0; |
432 | glVertex 0 , 0; |
409 | glVertex $self->{w}, 0; |
433 | glVertex $self->{w} - 1, 0; |
410 | glVertex $self->{w}, $self->{h}; |
434 | glVertex $self->{w} - 1, $self->{h} - 1; |
411 | glVertex 0 , $self->{h}; |
435 | glVertex 0 , $self->{h} - 1; |
412 | glEnd; |
436 | glEnd; |
413 | glPopMatrix; |
437 | glPopMatrix; |
414 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
438 | #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; |
415 | } |
439 | } |
416 | } |
440 | } |
… | |
… | |
436 | sub set_parent { |
460 | sub set_parent { |
437 | my ($self, $parent) = @_; |
461 | my ($self, $parent) = @_; |
438 | |
462 | |
439 | Scalar::Util::weaken ($self->{parent} = $parent); |
463 | Scalar::Util::weaken ($self->{parent} = $parent); |
440 | |
464 | |
|
|
465 | $self->{root} = $parent->{root}; |
|
|
466 | $self->{visible} = $parent->{visible} + 1; |
|
|
467 | |
441 | # TODO: req_w _does_change after ->reconfigure |
468 | # TODO: req_w _does_change after ->reconfigure |
442 | $self->check_size |
469 | $self->check_size |
443 | unless exists $self->{req_w}; |
470 | unless exists $self->{req_w}; |
444 | |
471 | |
445 | $self->show; |
472 | $self->show; |
… | |
… | |
463 | my ($self, $signal, $cb) = @_; |
490 | my ($self, $signal, $cb) = @_; |
464 | |
491 | |
465 | push @{ $self->{signal_cb}{$signal} }, $cb; |
492 | push @{ $self->{signal_cb}{$signal} }, $cb; |
466 | } |
493 | } |
467 | |
494 | |
|
|
495 | sub _emit { |
|
|
496 | my ($self, $signal, @args) = @_; |
|
|
497 | |
|
|
498 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
|
|
499 | } |
|
|
500 | |
468 | sub emit { |
501 | sub emit { |
469 | my ($self, $signal, @args) = @_; |
502 | my ($self, $signal, @args) = @_; |
470 | |
503 | |
471 | List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} |
504 | $self->_emit ($signal, @args) |
|
|
505 | || $self->$signal (@args); |
472 | } |
506 | } |
473 | |
507 | |
474 | sub DESTROY { |
508 | sub DESTROY { |
475 | my ($self) = @_; |
509 | my ($self) = @_; |
476 | |
510 | |
… | |
… | |
589 | delete $child->{parent}; |
623 | delete $child->{parent}; |
590 | $child->hide; |
624 | $child->hide; |
591 | |
625 | |
592 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
626 | $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; |
593 | |
627 | |
594 | $self->check_size; |
628 | $self->check_size (1); |
595 | $self->update; |
629 | $self->update; |
596 | } |
630 | } |
597 | |
631 | |
598 | sub clear { |
632 | sub clear { |
599 | my ($self) = @_; |
633 | my ($self) = @_; |
… | |
… | |
739 | |
773 | |
740 | package CFClient::UI::ViewPort; |
774 | package CFClient::UI::ViewPort; |
741 | |
775 | |
742 | our @ISA = CFClient::UI::Window::; |
776 | our @ISA = CFClient::UI::Window::; |
743 | |
777 | |
|
|
778 | sub new { |
|
|
779 | my $class = shift; |
|
|
780 | |
|
|
781 | $class->SUPER::new ( |
|
|
782 | scroll_x => 0, |
|
|
783 | scroll_y => 1, |
|
|
784 | @_, |
|
|
785 | ) |
|
|
786 | } |
|
|
787 | |
744 | sub size_request { |
788 | sub size_request { |
745 | my ($self) = @_; |
789 | my ($self) = @_; |
746 | |
790 | |
747 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
791 | @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; |
748 | |
792 | |
… | |
… | |
750 | } |
794 | } |
751 | |
795 | |
752 | sub size_allocate { |
796 | sub size_allocate { |
753 | my ($self, $w, $h) = @_; |
797 | my ($self, $w, $h) = @_; |
754 | |
798 | |
755 | my ($cw, $ch) = @$self{qw(child_w child_h)}; |
799 | $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; |
756 | # $w = $self->{w}; |
800 | $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; |
|
|
801 | |
757 | $self->child->configure (0, 0, $cw, $ch); |
802 | $self->child->configure (0, 0, $w, $h); |
758 | $self->update; |
803 | $self->update; |
759 | } |
804 | } |
760 | |
805 | |
761 | sub set_offset { |
806 | sub set_offset { |
762 | my ($self, $x, $y) = @_; |
807 | my ($self, $x, $y) = @_; |
… | |
… | |
816 | |
861 | |
817 | my $slider = new CFClient::UI::Slider |
862 | my $slider = new CFClient::UI::Slider |
818 | vertical => 1, |
863 | vertical => 1, |
819 | range => [0, 0, 1, 0.01], # HACK fix |
864 | range => [0, 0, 1, 0.01], # HACK fix |
820 | connect_changed => sub { |
865 | connect_changed => sub { |
821 | $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); |
866 | $self->{vp}->set_offset (0, $_[1]); |
822 | }, |
867 | }, |
823 | ; |
868 | ; |
824 | |
869 | |
825 | $self = $class->SUPER::new ( |
870 | $self = $class->SUPER::new ( |
826 | vp => (new CFClient::UI::ViewPort expand => 1), |
871 | vp => (new CFClient::UI::ViewPort expand => 1), |
… | |
… | |
831 | $self->{vp}->add ($self->{scrolled}); |
876 | $self->{vp}->add ($self->{scrolled}); |
832 | $self->add ($self->{vp}); |
877 | $self->add ($self->{vp}); |
833 | $self->add ($self->{slider}); |
878 | $self->add ($self->{slider}); |
834 | |
879 | |
835 | $self |
880 | $self |
|
|
881 | } |
|
|
882 | |
|
|
883 | sub update { |
|
|
884 | my ($self) = @_; |
|
|
885 | |
|
|
886 | $self->SUPER::update; |
|
|
887 | |
|
|
888 | # todo: overwrite size_allocate of child |
|
|
889 | my $child = $self->{vp}->child; |
|
|
890 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
|
|
891 | } |
|
|
892 | |
|
|
893 | sub size_allocate { |
|
|
894 | my ($self, $w, $h) = @_; |
|
|
895 | |
|
|
896 | $self->SUPER::size_allocate ($w, $h); |
|
|
897 | |
|
|
898 | my $child = $self->{vp}->child; |
|
|
899 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
836 | } |
900 | } |
837 | |
901 | |
838 | #TODO# update range on size_allocate depending on child |
902 | #TODO# update range on size_allocate depending on child |
839 | # update viewport offset on scroll |
903 | # update viewport offset on scroll |
840 | |
904 | |
… | |
… | |
894 | my $class = shift; |
958 | my $class = shift; |
895 | |
959 | |
896 | # TODO: user_x, user_y, overwrite moveto? |
960 | # TODO: user_x, user_y, overwrite moveto? |
897 | |
961 | |
898 | my $self = $class->SUPER::new ( |
962 | my $self = $class->SUPER::new ( |
899 | bg => [1, 1, 1, 1], |
963 | bg => [1, 1, 1, 1], |
900 | border_bg => [1, 1, 1, 1], |
964 | border_bg => [1, 1, 1, 1], |
901 | border => 0.6, |
965 | border => 0.6, |
902 | toplevel => 1, |
966 | is_toplevel => 1, |
903 | can_events => 1, |
967 | can_events => 1, |
904 | @_ |
968 | @_ |
905 | ); |
969 | ); |
906 | |
970 | |
907 | $self->{title} &&= new CFClient::UI::Label |
971 | $self->{title} &&= new CFClient::UI::Label |
908 | align => 0, |
972 | align => 0, |
… | |
… | |
1048 | sub new { |
1112 | sub new { |
1049 | my $class = shift; |
1113 | my $class = shift; |
1050 | |
1114 | |
1051 | $class->SUPER::new ( |
1115 | $class->SUPER::new ( |
1052 | col_expand => [], |
1116 | col_expand => [], |
1053 | @_ |
1117 | @_, |
1054 | ) |
1118 | ) |
|
|
1119 | } |
|
|
1120 | |
|
|
1121 | sub children { |
|
|
1122 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
1055 | } |
1123 | } |
1056 | |
1124 | |
1057 | sub add { |
1125 | sub add { |
1058 | my ($self, $x, $y, $child) = @_; |
1126 | my ($self, $x, $y, $child) = @_; |
1059 | |
1127 | |
1060 | $child->set_parent ($self); |
1128 | $child->set_parent ($self); |
1061 | $self->{children}[$y][$x] = $child; |
1129 | $self->{children}[$y][$x] = $child; |
1062 | |
1130 | |
1063 | $child->check_size; |
1131 | $self->check_size (1); |
1064 | } |
1132 | } |
1065 | |
1133 | |
1066 | sub children { |
|
|
1067 | grep $_, map @$_, grep $_, @{ $_[0]{children} } |
|
|
1068 | } |
|
|
1069 | |
|
|
1070 | # TODO: move to container class maybe? send childs a signal on removal? |
1134 | # TODO: move to container class maybe? send children a signal on removal? |
1071 | sub clear { |
1135 | sub clear { |
1072 | my ($self) = @_; |
1136 | my ($self) = @_; |
1073 | |
1137 | |
1074 | my @children = $self->children; |
1138 | my @children = $self->children; |
1075 | delete $self->{children}; |
1139 | delete $self->{children}; |
… | |
… | |
1077 | for (@children) { |
1141 | for (@children) { |
1078 | delete $_->{parent}; |
1142 | delete $_->{parent}; |
1079 | $_->hide; |
1143 | $_->hide; |
1080 | } |
1144 | } |
1081 | |
1145 | |
|
|
1146 | $self->check_size (1); |
1082 | $self->update; |
1147 | $self->update; |
1083 | } |
1148 | } |
1084 | |
1149 | |
1085 | sub get_wh { |
1150 | sub get_wh { |
1086 | my ($self) = @_; |
1151 | my ($self) = @_; |
… | |
… | |
1118 | sub size_allocate { |
1183 | sub size_allocate { |
1119 | my ($self, $w, $h) = @_; |
1184 | my ($self, $w, $h) = @_; |
1120 | |
1185 | |
1121 | my ($ws, $hs) = $self->get_wh; |
1186 | my ($ws, $hs) = $self->get_wh; |
1122 | |
1187 | |
1123 | my $req_w = sum @$ws; |
1188 | my $req_w = (sum @$ws) || 1; |
1124 | my $req_h = sum @$hs; |
1189 | my $req_h = (sum @$hs) || 1; |
1125 | |
1190 | |
1126 | # TODO: nicer code && do row_expand |
1191 | # TODO: nicer code && do row_expand |
1127 | my @col_expand = @{$self->{col_expand}}; |
1192 | my @col_expand = @{$self->{col_expand}}; |
1128 | @col_expand = (1) x @$ws unless @col_expand; |
1193 | @col_expand = (1) x @$ws unless @col_expand; |
1129 | my $col_expand = (sum @col_expand) || 1; |
1194 | my $col_expand = (sum @col_expand) || 1; |
… | |
… | |
1510 | $self->{text} = $text; |
1575 | $self->{text} = $text; |
1511 | |
1576 | |
1512 | $text =~ s/./*/g if $self->{hidden}; |
1577 | $text =~ s/./*/g if $self->{hidden}; |
1513 | $self->{layout}->set_text ("$text "); |
1578 | $self->{layout}->set_text ("$text "); |
1514 | |
1579 | |
1515 | $self->emit (changed => $self->{text}); |
1580 | $self->_emit (changed => $self->{text}); |
1516 | } |
1581 | } |
1517 | |
1582 | |
1518 | sub set_text { |
1583 | sub set_text { |
1519 | my ($self, $text) = @_; |
1584 | my ($self, $text) = @_; |
1520 | |
1585 | |
… | |
… | |
1532 | my ($self) = @_; |
1597 | my ($self) = @_; |
1533 | |
1598 | |
1534 | my ($w, $h) = $self->SUPER::size_request; |
1599 | my ($w, $h) = $self->SUPER::size_request; |
1535 | |
1600 | |
1536 | ($w + 1, $h) # add 1 for cursor |
1601 | ($w + 1, $h) # add 1 for cursor |
1537 | } |
|
|
1538 | |
|
|
1539 | sub size_allocate { |
|
|
1540 | my ($self, $w, $h) = @_; |
|
|
1541 | |
|
|
1542 | $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text |
|
|
1543 | } |
1602 | } |
1544 | |
1603 | |
1545 | sub key_down { |
1604 | sub key_down { |
1546 | my ($self, $ev) = @_; |
1605 | my ($self, $ev) = @_; |
1547 | |
1606 | |
… | |
… | |
1562 | } elsif ($sym == CFClient::SDLK_HOME) { |
1621 | } elsif ($sym == CFClient::SDLK_HOME) { |
1563 | $self->{cursor} = 0; |
1622 | $self->{cursor} = 0; |
1564 | } elsif ($sym == CFClient::SDLK_END) { |
1623 | } elsif ($sym == CFClient::SDLK_END) { |
1565 | $self->{cursor} = length $text; |
1624 | $self->{cursor} = length $text; |
1566 | } elsif ($uni == 27) { |
1625 | } elsif ($uni == 27) { |
1567 | $self->emit ('escape'); |
1626 | $self->_emit ('escape'); |
1568 | } elsif ($uni) { |
1627 | } elsif ($uni) { |
1569 | substr $text, $self->{cursor}++, 0, chr $uni; |
1628 | substr $text, $self->{cursor}++, 0, chr $uni; |
1570 | } |
1629 | } |
1571 | |
1630 | |
1572 | $self->_set_text ($text); |
1631 | $self->_set_text ($text); |
… | |
… | |
1659 | if ($sym == 13) { |
1718 | if ($sym == 13) { |
1660 | unshift @{$self->{history}}, |
1719 | unshift @{$self->{history}}, |
1661 | my $txt = $self->get_text; |
1720 | my $txt = $self->get_text; |
1662 | $self->{history_pointer} = -1; |
1721 | $self->{history_pointer} = -1; |
1663 | $self->{history_saveback} = ''; |
1722 | $self->{history_saveback} = ''; |
1664 | $self->emit (activate => $txt); |
1723 | $self->_emit (activate => $txt); |
1665 | $self->update; |
1724 | $self->update; |
1666 | |
1725 | |
1667 | } elsif ($sym == CFClient::SDLK_UP) { |
1726 | } elsif ($sym == CFClient::SDLK_UP) { |
1668 | if ($self->{history_pointer} < 0) { |
1727 | if ($self->{history_pointer} < 0) { |
1669 | $self->{history_saveback} = $self->get_text; |
1728 | $self->{history_saveback} = $self->get_text; |
… | |
… | |
1717 | can_events => 1, |
1776 | can_events => 1, |
1718 | @_ |
1777 | @_ |
1719 | ) |
1778 | ) |
1720 | } |
1779 | } |
1721 | |
1780 | |
|
|
1781 | sub activate { } |
|
|
1782 | |
1722 | sub button_up { |
1783 | sub button_up { |
1723 | my ($self, $ev, $x, $y) = @_; |
1784 | my ($self, $ev, $x, $y) = @_; |
1724 | |
1785 | |
|
|
1786 | $self->emit ("activate") |
1725 | if ($x >= 0 && $x < $self->{w} |
1787 | if $x >= 0 && $x < $self->{w} |
1726 | && $y >= 0 && $y < $self->{h}) { |
1788 | && $y >= 0 && $y < $self->{h}; |
1727 | $self->emit ("activate"); |
|
|
1728 | } |
|
|
1729 | } |
1789 | } |
1730 | |
1790 | |
1731 | sub _draw { |
1791 | sub _draw { |
1732 | my ($self) = @_; |
1792 | my ($self) = @_; |
1733 | |
1793 | |
… | |
… | |
1785 | my ($self, $ev, $x, $y) = @_; |
1845 | my ($self, $ev, $x, $y) = @_; |
1786 | |
1846 | |
1787 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1847 | if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} |
1788 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1848 | && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { |
1789 | $self->{state} = !$self->{state}; |
1849 | $self->{state} = !$self->{state}; |
1790 | $self->emit (changed => $self->{state}); |
1850 | $self->_emit (changed => $self->{state}); |
1791 | } |
1851 | } |
1792 | } |
1852 | } |
1793 | |
1853 | |
1794 | sub _draw { |
1854 | sub _draw { |
1795 | my ($self) = @_; |
1855 | my ($self) = @_; |
… | |
… | |
2088 | } |
2148 | } |
2089 | |
2149 | |
2090 | sub set_range { |
2150 | sub set_range { |
2091 | my ($self, $range) = @_; |
2151 | my ($self, $range) = @_; |
2092 | |
2152 | |
2093 | $self->{range} = $range; |
2153 | ($range, $self->{range}) = ($self->{range}, $range); |
2094 | |
2154 | |
2095 | $self->update; |
2155 | $self->update |
|
|
2156 | if "@$range" ne "@{$self->{range}}"; |
2096 | } |
2157 | } |
2097 | |
2158 | |
2098 | sub set_value { |
2159 | sub set_value { |
2099 | my ($self, $value) = @_; |
2160 | my ($self, $value) = @_; |
2100 | |
2161 | |
… | |
… | |
2111 | if $unit; |
2172 | if $unit; |
2112 | |
2173 | |
2113 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2174 | @{$self->{range}} = ($value, $lo, $hi, $page, $unit); |
2114 | |
2175 | |
2115 | if ($value != $old_value) { |
2176 | if ($value != $old_value) { |
2116 | $self->emit (changed => $value); |
2177 | $self->_emit (changed => $value); |
2117 | $self->update; |
2178 | $self->update; |
2118 | } |
2179 | } |
2119 | } |
2180 | } |
2120 | |
2181 | |
2121 | sub size_request { |
2182 | sub size_request { |
… | |
… | |
2503 | |
2564 | |
2504 | # TODO: use animation |
2565 | # TODO: use animation |
2505 | if ($self->{state} = !$self->{state}) { |
2566 | if ($self->{state} = !$self->{state}) { |
2506 | $CFClient::UI::ROOT->add ($self->{other}); |
2567 | $CFClient::UI::ROOT->add ($self->{other}); |
2507 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2568 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
2508 | $self->emit ("open"); |
2569 | $self->_emit ("open"); |
2509 | } else { |
2570 | } else { |
2510 | $CFClient::UI::ROOT->remove ($self->{other}); |
2571 | $CFClient::UI::ROOT->remove ($self->{other}); |
2511 | $self->emit ("close"); |
2572 | $self->_emit ("close"); |
2512 | } |
2573 | } |
2513 | |
2574 | |
2514 | $self->emit (changed => $self->{state}); |
2575 | $self->_emit (changed => $self->{state}); |
2515 | } |
2576 | } |
2516 | |
2577 | |
2517 | ############################################################################# |
2578 | ############################################################################# |
2518 | |
2579 | |
2519 | package CFClient::UI::Tooltip; |
2580 | package CFClient::UI::Tooltip; |
… | |
… | |
2595 | |
2656 | |
2596 | sub new { |
2657 | sub new { |
2597 | my $class = shift; |
2658 | my $class = shift; |
2598 | |
2659 | |
2599 | my $self = $class->SUPER::new ( |
2660 | my $self = $class->SUPER::new ( |
2600 | aspect => 1, |
2661 | aspect => 1, |
|
|
2662 | can_events => 0, |
2601 | @_, |
2663 | @_, |
2602 | ); |
2664 | ); |
2603 | |
2665 | |
2604 | if ($self->{anim} && $self->{animspeed}) { |
2666 | if ($self->{anim} && $self->{animspeed}) { |
2605 | Scalar::Util::weaken (my $widget = $self); |
2667 | Scalar::Util::weaken (my $widget = $self); |
… | |
… | |
2664 | $self->SUPER::DESTROY; |
2726 | $self->SUPER::DESTROY; |
2665 | } |
2727 | } |
2666 | |
2728 | |
2667 | ############################################################################# |
2729 | ############################################################################# |
2668 | |
2730 | |
2669 | package CFClient::UI::InventoryItem; |
2731 | package CFClient::UI::Inventory; |
2670 | |
2732 | |
2671 | our @ISA = CFClient::UI::HBox::; |
2733 | our @ISA = CFClient::UI::ScrolledWindow::; |
2672 | |
|
|
2673 | sub _item_to_desc { |
|
|
2674 | my ($item) = @_; |
|
|
2675 | |
|
|
2676 | my $desc = |
|
|
2677 | $item->{nrof} < 2 |
|
|
2678 | ? $item->{name} |
|
|
2679 | : "$item->{nrof} × $item->{name_pl}"; |
|
|
2680 | |
|
|
2681 | $item->{flags} & Crossfire::Protocol::F_OPEN |
|
|
2682 | and $desc .= " (open)"; |
|
|
2683 | $item->{flags} & Crossfire::Protocol::F_APPLIED |
|
|
2684 | and $desc .= " (applied)"; |
|
|
2685 | $item->{flags} & Crossfire::Protocol::F_UNPAID |
|
|
2686 | and $desc .= " (unpaid)"; |
|
|
2687 | $item->{flags} & Crossfire::Protocol::F_MAGIC |
|
|
2688 | and $desc .= " (magic)"; |
|
|
2689 | $item->{flags} & Crossfire::Protocol::F_CURSED |
|
|
2690 | and $desc .= " (cursed)"; |
|
|
2691 | $item->{flags} & Crossfire::Protocol::F_DAMNED |
|
|
2692 | and $desc .= " (damned)"; |
|
|
2693 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2694 | and $desc .= " *"; |
|
|
2695 | |
|
|
2696 | $desc |
|
|
2697 | } |
|
|
2698 | |
2734 | |
2699 | sub new { |
2735 | sub new { |
2700 | my $class = shift; |
2736 | my $class = shift; |
2701 | |
2737 | |
2702 | my %args = @_; |
|
|
2703 | |
|
|
2704 | my $item = delete $args{item}; |
|
|
2705 | |
|
|
2706 | my $desc = _item_to_desc ($item); |
|
|
2707 | |
|
|
2708 | my $self = $class->SUPER::new ( |
2738 | my $self = $class->SUPER::new ( |
2709 | can_hover => 1, |
|
|
2710 | can_events => 1, |
|
|
2711 | tooltip => ((CFClient::UI::Label::escape $desc) |
|
|
2712 | . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"), |
|
|
2713 | connect_button_down => sub { |
|
|
2714 | my ($self, $ev, $x, $y) = @_; |
|
|
2715 | |
|
|
2716 | # todo: maybe put examine on 1? but should just be a tooltip :( |
|
|
2717 | if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { |
|
|
2718 | my $targ = $::CONN->{player}{tag}; |
|
|
2719 | |
|
|
2720 | if ($item->{container} == $::CONN->{player}{tag}) { |
|
|
2721 | $targ = $main::OPENCONT; |
|
|
2722 | } |
|
|
2723 | |
|
|
2724 | $::CONN->send ("move $targ $item->{tag} 0"); |
|
|
2725 | } elsif ($ev->{button} == 1) { |
|
|
2726 | $::CONN->send ("examine $item->{tag}"); |
|
|
2727 | } elsif ($ev->{button} == 2) { |
|
|
2728 | $::CONN->send ("apply $item->{tag}"); |
|
|
2729 | } elsif ($ev->{button} == 3) { |
|
|
2730 | my @menu_items = ( |
|
|
2731 | ["examine", sub { $::CONN->send ("examine $item->{tag}") }], |
|
|
2732 | ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }], |
|
|
2733 | ["apply", sub { $::CONN->send ("apply $item->{tag}") }], |
|
|
2734 | ( |
|
|
2735 | $item->{flags} & Crossfire::Protocol::F_LOCKED |
|
|
2736 | ? ( |
|
|
2737 | ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }], |
|
|
2738 | ) |
|
|
2739 | : ( |
|
|
2740 | ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }], |
|
|
2741 | ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], |
|
|
2742 | ) |
|
|
2743 | ), |
|
|
2744 | ); |
|
|
2745 | |
|
|
2746 | CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); |
|
|
2747 | } |
|
|
2748 | |
|
|
2749 | 1 |
|
|
2750 | }, |
|
|
2751 | %args |
|
|
2752 | ); |
|
|
2753 | |
|
|
2754 | |
|
|
2755 | $self->add (new CFClient::UI::Face |
|
|
2756 | can_events => 0, |
|
|
2757 | face => $item->{face}, |
|
|
2758 | anim => $item->{anim}, |
|
|
2759 | animspeed => $item->{animspeed}, |
|
|
2760 | ); |
|
|
2761 | |
|
|
2762 | $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0); |
|
|
2763 | |
|
|
2764 | $self->{item} = $item; |
|
|
2765 | |
|
|
2766 | $self->update_item; |
|
|
2767 | |
|
|
2768 | $self |
|
|
2769 | } |
|
|
2770 | |
|
|
2771 | sub update_item { |
|
|
2772 | my ($self) = @_; |
|
|
2773 | |
|
|
2774 | my $desc = _item_to_desc ($self->{item}); |
|
|
2775 | |
|
|
2776 | $self->{name_lbl}->set_text ($desc); |
|
|
2777 | } |
|
|
2778 | |
|
|
2779 | ############################################################################# |
|
|
2780 | |
|
|
2781 | package CFClient::UI::Inventory; |
|
|
2782 | |
|
|
2783 | our @ISA = CFClient::UI::ScrolledWindow::; |
|
|
2784 | |
|
|
2785 | sub new { |
|
|
2786 | my $class = shift; |
|
|
2787 | |
|
|
2788 | my $self = $class->SUPER::new ( |
|
|
2789 | scrolled => (new CFClient::UI::Table), |
2739 | scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
2790 | @_, |
2740 | @_, |
2791 | ); |
2741 | ); |
2792 | |
2742 | |
2793 | $self |
2743 | $self |
2794 | } |
2744 | } |
… | |
… | |
2804 | or ($a->{name} cmp $b->{name}) |
2754 | or ($a->{name} cmp $b->{name}) |
2805 | } @$items; |
2755 | } @$items; |
2806 | |
2756 | |
2807 | $self->{real_items} = \@items; |
2757 | $self->{real_items} = \@items; |
2808 | |
2758 | |
|
|
2759 | my $row = 0; |
2809 | for my $item (@items) { |
2760 | for my $item (@items) { |
2810 | $item->{item} = $item; |
2761 | CFClient::Item::update_widgets $item; |
2811 | $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; |
|
|
2812 | $item->update_item (); |
|
|
2813 | } |
|
|
2814 | |
2762 | |
2815 | my $i = 0; |
2763 | $self->{scrolled}->add (0, $row, $item->{face_widget}); |
2816 | for (@items) { |
2764 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2817 | $self->{scrolled}->add (0, $i, $_); |
2765 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2818 | my $nrof = $_->{item}->{nrof} || 1; |
|
|
2819 | $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); |
|
|
2820 | } |
|
|
2821 | |
2766 | |
2822 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
2767 | $row++; |
|
|
2768 | } |
2823 | } |
2769 | } |
2824 | |
2770 | |
2825 | sub size_request { |
2771 | sub size_request { |
2826 | my ($self) = @_; |
2772 | my ($self) = @_; |
2827 | ($self->{req_w}, $self->{req_h}); |
2773 | ($self->{req_w}, $self->{req_h}); |
… | |
… | |
2867 | |
2813 | |
2868 | # popup given the event (must be a mouse button down event currently) |
2814 | # popup given the event (must be a mouse button down event currently) |
2869 | sub popup { |
2815 | sub popup { |
2870 | my ($self, $ev) = @_; |
2816 | my ($self, $ev) = @_; |
2871 | |
2817 | |
2872 | $self->emit ("popdown"); |
2818 | $self->_emit ("popdown"); |
2873 | |
2819 | |
2874 | # maybe save $GRAB? must be careful about events... |
2820 | # maybe save $GRAB? must be careful about events... |
2875 | $GRAB = $self; |
2821 | $GRAB = $self; |
2876 | $self->{button} = $ev->{button}; |
2822 | $self->{button} = $ev->{button}; |
2877 | |
2823 | |
… | |
… | |
2892 | |
2838 | |
2893 | if ($ev->{button} == $self->{button}) { |
2839 | if ($ev->{button} == $self->{button}) { |
2894 | undef $GRAB; |
2840 | undef $GRAB; |
2895 | $self->hide; |
2841 | $self->hide; |
2896 | |
2842 | |
2897 | $self->emit ("popdown"); |
2843 | $self->_emit ("popdown"); |
2898 | $self->{hover}[1]->() if $self->{hover}; |
2844 | $self->{hover}[1]->() if $self->{hover}; |
2899 | } |
2845 | } |
2900 | } |
2846 | } |
2901 | |
2847 | |
2902 | ############################################################################# |
2848 | ############################################################################# |
… | |
… | |
2964 | sub add { |
2910 | sub add { |
2965 | my ($self, $text, %arg) = @_; |
2911 | my ($self, $text, %arg) = @_; |
2966 | |
2912 | |
2967 | $text =~ s/^\s+//; |
2913 | $text =~ s/^\s+//; |
2968 | $text =~ s/\s+$//; |
2914 | $text =~ s/\s+$//; |
|
|
2915 | |
|
|
2916 | return unless $text; |
2969 | |
2917 | |
2970 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2918 | my $timeout = time + ((delete $arg{timeout}) || 60); |
2971 | |
2919 | |
2972 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2920 | my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; |
2973 | |
2921 | |
… | |
… | |
3017 | |
2965 | |
3018 | sub new { |
2966 | sub new { |
3019 | my $class = shift; |
2967 | my $class = shift; |
3020 | |
2968 | |
3021 | $class->SUPER::new ( |
2969 | $class->SUPER::new ( |
|
|
2970 | visible => 1, |
3022 | @_, |
2971 | @_, |
3023 | ) |
2972 | ) |
3024 | } |
2973 | } |
3025 | |
2974 | |
3026 | sub configure { |
2975 | sub configure { |
… | |
… | |
3044 | } |
2993 | } |
3045 | |
2994 | |
3046 | sub size_allocate { |
2995 | sub size_allocate { |
3047 | my ($self, $w, $h) = @_; |
2996 | my ($self, $w, $h) = @_; |
3048 | |
2997 | |
3049 | my $old_w = $self->{old_w}; $self->{old_w} = $w; |
|
|
3050 | my $old_h = $self->{old_h}; $self->{old_h} = $h; |
|
|
3051 | |
|
|
3052 | CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h |
|
|
3053 | if $old_w && $old_h && ($old_w != $w || $old_h != $h); |
|
|
3054 | |
|
|
3055 | for my $child ($self->children) { |
2998 | for my $child ($self->children) { |
3056 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
2999 | my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; |
3057 | |
3000 | |
3058 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3001 | $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 |
3059 | if exists $child->{req_x}; |
3002 | if exists $child->{req_x}; |
… | |
… | |
3088 | } |
3031 | } |
3089 | |
3032 | |
3090 | sub add { |
3033 | sub add { |
3091 | my ($self, @children) = @_; |
3034 | my ($self, @children) = @_; |
3092 | |
3035 | |
|
|
3036 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3037 | push @widgets, $w->children; |
|
|
3038 | $w->{root} = $self; |
|
|
3039 | $w->{visible} = $self->{visible} + 1; |
|
|
3040 | } |
|
|
3041 | |
3093 | for my $child (@children) { |
3042 | for my $child (@children) { |
3094 | $child->{toplevel} = 1; |
3043 | $child->{is_toplevel} = 1; |
3095 | |
3044 | |
3096 | # integerise window positions |
3045 | # integerise window positions |
3097 | $child->{x} = int $child->{x}; |
3046 | $child->{x} = int $child->{x}; |
3098 | $child->{y} = int $child->{y}; |
3047 | $child->{y} = int $child->{y}; |
3099 | } |
3048 | } |
3100 | |
3049 | |
3101 | $self->SUPER::add (@children); |
3050 | $self->SUPER::add (@children); |
|
|
3051 | } |
|
|
3052 | |
|
|
3053 | sub remove { |
|
|
3054 | my ($self, @children) = @_; |
|
|
3055 | |
|
|
3056 | $self->SUPER::remove (@children); |
3102 | |
3057 | |
3103 | while (@children) { |
3058 | while (@children) { |
3104 | my $w = pop @children; |
3059 | my $w = pop @children; |
3105 | push @children, $w->children; |
3060 | push @children, $w->children; |
3106 | $w->{visible} = 1; |
3061 | $w->set_invisible; |
3107 | } |
|
|
3108 | } |
|
|
3109 | |
|
|
3110 | sub remove { |
|
|
3111 | my ($self, @children) = @_; |
|
|
3112 | |
|
|
3113 | $self->SUPER::remove (@children); |
|
|
3114 | |
|
|
3115 | while (@children) { |
|
|
3116 | my $w = pop @children; |
|
|
3117 | push @children, $w->children; |
|
|
3118 | delete $w->{visible}; |
|
|
3119 | } |
3062 | } |
3120 | } |
3063 | } |
3121 | |
3064 | |
3122 | sub on_refresh { |
3065 | sub on_refresh { |
3123 | my ($self, $id, $cb) = @_; |
3066 | my ($self, $id, $cb) = @_; |
… | |
… | |
3177 | $w = 0 if $w < 0; |
3120 | $w = 0 if $w < 0; |
3178 | $h = 0 if $h < 0; |
3121 | $h = 0 if $h < 0; |
3179 | |
3122 | |
3180 | $widget->{w} = $w; |
3123 | $widget->{w} = $w; |
3181 | $widget->{h} = $h; |
3124 | $widget->{h} = $h; |
3182 | $widget->size_allocate ($w, $h); |
|
|
3183 | $widget->emit (size_allocate => $w, $h); |
3125 | $widget->emit (size_allocate => $w, $h); |
3184 | } |
3126 | } |
3185 | } |
3127 | } |
3186 | |
3128 | |
3187 | while ($self->{post_alloc_hook}) { |
3129 | while ($self->{post_alloc_hook}) { |