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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
27 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
28 48
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 50
31 $TOOLTIP->set_tooltip_from ($widget); 51 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show;
33 52
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35 54
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0) 55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH; 56 if $x + $TOOLTIP->{w} > $::WIDTH;
38 57
39 $TOOLTIP->move ($x, $y); 58 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update; 59 $TOOLTIP->show;
42 } 60 }
43 61
44 return; 62 return;
45 } 63 }
46 } 64 }
… …
155 for my $widget (values %WIDGET) { 173 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 174 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 177 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 180 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 } 181 }
166 } 182 }
167 183
168 reconfigure_widgets; 184 reconfigure_widgets;
169} 185}
… …
186 can_events => 1, 202 can_events => 1,
187 @_ 203 @_
188 }, $class; 204 }, $class;
189 205
190 for (keys %$self) { 206 for (keys %$self) {
191 if (/^connect_(.*)$/) { 207 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 208 $self->connect ($1 => delete $self->{$_});
193 } 209 }
194 } 210 }
195 211
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 213
214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215 $self->{req_x} = $layout->{x} * $::WIDTH;
216 $self->{req_y} = $layout->{y} * $::HEIGHT;
217 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
218 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
219 }
220
198 $self 221 $self
199} 222}
200 223
201sub destroy { 224sub destroy {
202 my ($self) = @_; 225 my ($self) = @_;
… …
205 %$self = (); 228 %$self = ();
206} 229}
207 230
208sub show { 231sub show {
209 my ($self) = @_; 232 my ($self) = @_;
233
210 return if $self->{parent}; 234 return if $self->{parent};
211 235
212 $CFClient::UI::ROOT->add ($self); 236 $CFClient::UI::ROOT->add ($self);
213} 237}
214 238
215sub show_centered { 239sub center {
216 my ($self) = @_; 240 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 241
221 $CFClient::UI::ROOT->on_post_alloc ( 242 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 243 "center_$self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
224 }, 245 },
225 ); 246 );
247
248 $self->update;
249}
250
251sub set_visible {
252 my ($self) = @_;
253
254 return if $self->{visible};
255
256 $self->{root} = $self->{parent}{root};
257 $self->{visible} = $self->{parent}{visible} + 1;
258
259 $self->emit (visibility_change => 1);
260
261 $self->realloc if !exists $self->{req_w};
262
263 $_->set_visible for $self->children;
226} 264}
227 265
228sub set_invisible { 266sub set_invisible {
229 my ($self) = @_; 267 my ($self) = @_;
230 268
231 # broken show/hide model 269 return unless $self->{visible};
232 270
271 $_->set_invisible for $self->children;
272
273 delete $self->{root};
233 delete $self->{visible}; 274 delete $self->{visible};
234 275
235 undef $GRAB if $GRAB == $self; 276 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 277 undef $HOVER if $HOVER == $self;
237 278
238 CFClient::UI::check_tooltip 279 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 280 if $TOOLTIP->{owner} == $self;
240 281
241 $self->focus_out; 282 $self->focus_out;
283
284 $self->emit (visibility_change => 0);
285}
286
287sub set_visibility {
288 my ($self, $visible) = @_;
289
290 return if $self->{visible} == $visible;
291
292 $visible ? $self->hide
293 : $self->show;
294}
295
296sub toggle_visibility {
297 my ($self) = @_;
298
299 $self->{visible}
300 ? $self->hide
301 : $self->show;
242} 302}
243 303
244sub hide { 304sub hide {
245 my ($self) = @_; 305 my ($self) = @_;
246 306
… …
261} 321}
262 322
263sub set_size { 323sub set_size {
264 my ($self, $w, $h) = @_; 324 my ($self, $w, $h) = @_;
265 325
266 $self->{user_w} = $w; 326 $self->{def_w} = $w;
267 $self->{user_h} = $h; 327 $self->{def_h} = $h;
268 328
269 $self->check_size; 329 $self->realloc;
270} 330}
271 331
272sub size_request { 332sub size_request {
273 require Carp; 333 require Carp;
274 Carp::confess "size_request is abstract"; 334 Carp::confess "size_request is abstract";
… …
294 $self->{y} = $y; 354 $self->{y} = $y;
295 $self->update; 355 $self->update;
296 } 356 }
297 357
298 if ($self->{w} != $w || $self->{h} != $h) { 358 if ($self->{w} != $w || $self->{h} != $h) {
359 return unless $self->{visible};
360
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 362 }
301} 363}
302 364
303sub size_allocate { 365sub size_allocate {
304 # nothing to be done 366 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 367}
313 368
314sub children { 369sub children {
315} 370}
316 371
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 453sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
454
455sub find_widget {
456 my ($self, $x, $y) = @_;
457
458 return () unless $self->{can_events};
459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471
472 $self->set_visible if $parent->{visible};
473}
474
475sub connect {
476 my ($self, $signal, $cb) = @_;
477
478 push @{ $self->{signal_cb}{$signal} }, $cb;
479}
480
481sub _emit {
482 my ($self, $signal, @args) = @_;
483
484 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
485}
486
487sub emit {
488 my ($self, $signal, @args) = @_;
489
490 $self->_emit ($signal, @args)
491 || $self->$signal (@args);
492}
493
494sub visibility_change {
495 #my ($self, $visible) = @_;
496}
497
498sub realloc {
499 my ($self) = @_;
500
501 if ($self->{visible}) {
502 return if $self->{root}{realloc}{$self};
503
504 $self->{root}{realloc}{$self} = $self;
505 $self->{root}->update;
506 } else {
507 delete $self->{req_w};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
399 517
400sub draw { 518sub draw {
401 my ($self) = @_; 519 my ($self) = @_;
402 520
403 return unless $self->{h} && $self->{w}; 521 return unless $self->{h} && $self->{w};
… …
441 my ($self) = @_; 559 my ($self) = @_;
442 560
443 warn "no draw defined for $self\n"; 561 warn "no draw defined for $self\n";
444} 562}
445 563
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 564sub DESTROY {
504 my ($self) = @_; 565 my ($self) = @_;
505 566
506 delete $WIDGET{$self+0}; 567 delete $WIDGET{$self+0};
507 #$self->deactivate; 568 #$self->deactivate;
… …
602 $self->{children} = [ 663 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 665 @{$self->{children}}, @widgets
605 ]; 666 ];
606 667
607 $self->check_size (1); 668 $self->realloc;
608 $self->update;
609} 669}
610 670
611sub children { 671sub children {
612 @{ $_[0]{children} } 672 @{ $_[0]{children} }
613} 673}
… …
618 delete $child->{parent}; 678 delete $child->{parent};
619 $child->hide; 679 $child->hide;
620 680
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 682
623 $self->check_size; 683 $self->realloc;
624 $self->update;
625} 684}
626 685
627sub clear { 686sub clear {
628 my ($self) = @_; 687 my ($self) = @_;
629 688
… …
633 for (@$children) { 692 for (@$children) {
634 delete $_->{parent}; 693 delete $_->{parent};
635 $_->hide; 694 $_->hide;
636 } 695 }
637 696
638 $self->check_size; 697 $self->realloc;
639 $self->update;
640} 698}
641 699
642sub find_widget { 700sub find_widget {
643 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
644 702
… …
697sub size_request { 755sub size_request {
698 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
699} 757}
700 758
701sub size_allocate { 759sub size_allocate {
702 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
703 761
704 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
705} 763}
706 764
707############################################################################# 765#############################################################################
… …
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 783 $self->SUPER::update;
726} 784}
727 785
728sub size_allocate { 786sub size_allocate {
729 my ($self, $w, $h) = @_; 787 my ($self, $w, $h, $changed) = @_;
730 788
731 $self->SUPER::size_allocate ($w, $h); 789 $self->SUPER::size_allocate ($w, $h, $changed);
732 $self->update; 790 $self->update
791 if $changed;
733} 792}
734 793
735sub _render { 794sub _render {
736 $_[0]{children}[0]->draw; 795 $_[0]{children}[0]->draw;
737} 796}
… …
781} 840}
782 841
783sub size_request { 842sub size_request {
784 my ($self) = @_; 843 my ($self) = @_;
785 844
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 845 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
787 846
788 @$self{qw(child_w child_h)} 847 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y};
849
850 ($w, $h)
789} 851}
790 852
791sub size_allocate { 853sub size_allocate {
792 my ($self, $w, $h) = @_; 854 my ($self, $w, $h, $changed) = @_;
793 855
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796 858
797 $self->child->configure (0, 0, $w, $h); 859 $self->child->configure (0, 0, $w, $h);
… …
853 my $class = shift; 915 my $class = shift;
854 916
855 my $self; 917 my $self;
856 918
857 my $slider = new CFClient::UI::Slider 919 my $slider = new CFClient::UI::Slider
858 vertical => 1, 920 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 921 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 922 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 923 $self->{vp}->set_offset (0, $_[1]);
862 }, 924 },
863 ; 925 ;
864 926
865 $self = $class->SUPER::new ( 927 $self = $class->SUPER::new (
… …
873 $self->add ($self->{slider}); 935 $self->add ($self->{slider});
874 936
875 $self 937 $self
876} 938}
877 939
940sub update {
941 my ($self) = @_;
942
943 $self->SUPER::update;
944
945 # todo: overwrite size_allocate of child
946 my $child = $self->{vp}->child;
947 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
948}
949
878sub size_allocate { 950sub size_allocate {
879 my ($self, $w, $h) = @_; 951 my ($self, $w, $h, $changed) = @_;
880 952
881 $self->SUPER::size_allocate ($w, $h); 953 $self->SUPER::size_allocate ($w, $h, $changed);
882 954
883 my $child = $self->{vp}->child; 955 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 956 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885} 957}
886 958
… …
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1012 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1013
942sub new { 1014sub new {
943 my $class = shift; 1015 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1016
947 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1020 border => 0.6,
… …
976 $h + $self->border * 2, 1046 $h + $self->border * 2,
977 ) 1047 )
978} 1048}
979 1049
980sub size_allocate { 1050sub size_allocate {
981 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
982 1054
983 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
985 1057
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1058 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1010 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
1011 1083
1012 my $dx = $ev->{x} - $ox; 1084 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1085 my $dy = $ev->{y} - $oy;
1014 1086
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1091 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1092 $self->realloc;
1019 }; 1093 };
1020 1094
1021 } elsif ($lr ^ $td) { 1095 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1099 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
1027 1101
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1103
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1104 $self->{user_x} = $bx + $x - $ox;
1105 $self->{user_y} = $by + $y - $oy;
1106
1107 $self->move ($self->{user_x}, $self->{user_y});
1031 $self->update; 1108 $self->realloc;
1032 }; 1109 };
1033 } 1110 }
1034} 1111}
1035 1112
1036sub button_up { 1113sub button_up {
… …
1101 col_expand => [], 1178 col_expand => [],
1102 @_, 1179 @_,
1103 ) 1180 )
1104} 1181}
1105 1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1185}
1186
1106sub add { 1187sub add {
1107 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1108 1189
1109 $child->set_parent ($self); 1190 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1111 1192
1112 $child->check_size; 1193 $self->realloc;
1113} 1194}
1114 1195
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1196# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1197sub clear {
1121 my ($self) = @_; 1198 my ($self) = @_;
1122 1199
1123 my @children = $self->children; 1200 my @children = $self->children;
1124 delete $self->{children}; 1201 delete $self->{children};
… …
1126 for (@children) { 1203 for (@children) {
1127 delete $_->{parent}; 1204 delete $_->{parent};
1128 $_->hide; 1205 $_->hide;
1129 } 1206 }
1130 1207
1131 $self->update; 1208 $self->realloc;
1132} 1209}
1133 1210
1134sub get_wh { 1211sub get_wh {
1135 my ($self) = @_; 1212 my ($self) = @_;
1136 1213
… …
1163 (sum @$hs), 1240 (sum @$hs),
1164 ) 1241 )
1165} 1242}
1166 1243
1167sub size_allocate { 1244sub size_allocate {
1168 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1169 1246
1170 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1171 1248
1172 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1174 1251
1175 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1309 }
1233} 1310}
1234 1311
1235############################################################################# 1312#############################################################################
1236 1313
1314package CFClient::UI::Box;
1315
1316our @ISA = CFClient::UI::Container::;
1317
1318sub size_request {
1319 my ($self) = @_;
1320
1321 $self->{vertical}
1322 ? (
1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1325 )
1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1330}
1331
1332sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_;
1334
1335 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children};
1337
1338 my @req;
1339
1340 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children;
1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1355 for 0 .. $#$children;
1356 }
1357 }
1358
1359 CFClient::UI::harmonize \@req;
1360
1361 my $pos = 0;
1362 for (0 .. $#$children) {
1363 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365
1366 $pos += $alloc;
1367 }
1368
1369 1
1370}
1371
1372#############################################################################
1373
1237package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1238 1375
1239# TODO: wrap into common Box base class
1240
1241our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1242 1377
1243sub size_request { 1378sub new {
1244 my ($self) = @_; 1379 my $class = shift;
1245 1380
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1247 1382 vertical => 0,
1248 ( 1383 @_,
1249 (List::Util::sum map $_->[0], @alloc),
1250 (List::Util::max map $_->[1], @alloc),
1251 ) 1384 )
1252} 1385}
1253 1386
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1387#############################################################################
1296 1388
1297package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1298 1390
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1302 1392
1303sub size_request { 1393sub new {
1304 my ($self) = @_; 1394 my $class = shift;
1305 1395
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1307 1397 vertical => 1,
1308 ( 1398 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1399 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1400}
1352 1401
1353############################################################################# 1402#############################################################################
1354 1403
1355package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
1418 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1419 1468
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1422 1471
1472 $self->realloc;
1423 $self->update; 1473 $self->update;
1424 $self->check_size;
1425} 1474}
1426 1475
1427sub set_markup { 1476sub set_markup {
1428 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1429 1478
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1483
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1437 1486
1487 $self->realloc;
1438 $self->update; 1488 $self->update;
1439 $self->check_size;
1440} 1489}
1441 1490
1442sub size_request { 1491sub size_request {
1443 my ($self) = @_; 1492 my ($self) = @_;
1444 1493
… …
1465 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1466 ) 1515 )
1467} 1516}
1468 1517
1469sub size_allocate { 1518sub size_allocate {
1470 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1471 1520
1472 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1473} 1523}
1474 1524
1475sub set_fontsize { 1525sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1477 1527
1478 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1529 delete $self->{texture};
1480 1530
1481 $self->update; 1531 $self->realloc;
1482 $self->check_size;
1483} 1532}
1484 1533
1485sub _draw { 1534sub _draw {
1486 my ($self) = @_; 1535 my ($self) = @_;
1487 1536
… …
1567sub set_text { 1616sub set_text {
1568 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1569 1618
1570 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1620 $self->_set_text ($text);
1572 $self->update; 1621
1573 $self->check_size; 1622 $self->realloc;
1574} 1623}
1575 1624
1576sub get_text { 1625sub get_text {
1577 $_[0]{text} 1626 $_[0]{text}
1578} 1627}
… …
1611 } elsif ($uni) { 1660 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1613 } 1662 }
1614 1663
1615 $self->_set_text ($text); 1664 $self->_set_text ($text);
1616 $self->update; 1665
1617 $self->check_size; 1666 $self->realloc;
1618} 1667}
1619 1668
1620sub focus_in { 1669sub focus_in {
1621 my ($self) = @_; 1670 my ($self) = @_;
1622 1671
… …
2129 $self->update; 2178 $self->update;
2130 2179
2131 $self 2180 $self
2132} 2181}
2133 2182
2183sub changed { }
2184
2134sub set_range { 2185sub set_range {
2135 my ($self, $range) = @_; 2186 my ($self, $range) = @_;
2136 2187
2137 $self->{range} = $range; 2188 ($range, $self->{range}) = ($self->{range}, $range);
2138 2189
2139 $self->update; 2190 $self->update
2191 if "@$range" ne "@{$self->{range}}";
2140} 2192}
2141 2193
2142sub set_value { 2194sub set_value {
2143 my ($self, $value) = @_; 2195 my ($self, $value) = @_;
2144 2196
… …
2326 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2327 $self->reflow; 2379 $self->reflow;
2328} 2380}
2329 2381
2330sub size_allocate { 2382sub size_allocate {
2331 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2332 2384
2333 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2334 2388
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2338 2392
… …
2527 2581
2528sub new { 2582sub new {
2529 my $class = shift; 2583 my $class = shift;
2530 2584
2531 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2532 state => 0, 2586 state => 0,
2533 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2534 @_ 2588 @_
2535 ); 2589 );
2536 2590
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2591 $self
2543} 2592}
2544 2593
2545sub toggle_flopper { 2594sub toggle_flopper {
2546 my ($self) = @_; 2595 my ($self) = @_;
2547 2596
2548 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2598}
2560 2599
2561############################################################################# 2600#############################################################################
2562 2601
2563package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2595 2634
2596 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2597} 2636}
2598 2637
2599sub size_allocate { 2638sub size_allocate {
2600 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2601 2640
2641 return unless $changed;
2642
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2603} 2644}
2604 2645
2605sub _draw { 2646sub _draw {
2606 my ($self) = @_; 2647 my ($self) = @_;
2607 2648
… …
2624 glVertex $w, $h; 2665 glVertex $w, $h;
2625 glVertex $w, 0; 2666 glVertex $w, 0;
2626 glEnd; 2667 glEnd;
2627 2668
2628 glTranslate 2 - 0.375, 2 - 0.375; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2670
2629 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2630} 2672}
2631 2673
2632############################################################################# 2674#############################################################################
2633 2675
… …
2709 $self->SUPER::DESTROY; 2751 $self->SUPER::DESTROY;
2710} 2752}
2711 2753
2712############################################################################# 2754#############################################################################
2713 2755
2714package CFClient::UI::InventoryItem;
2715
2716our @ISA = CFClient::UI::HBox::;
2717
2718sub new {
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory; 2756package CFClient::UI::Inventory;
2801 2757
2802our @ISA = CFClient::UI::ScrolledWindow::; 2758our @ISA = CFClient::UI::ScrolledWindow::;
2803 2759
2804sub new { 2760sub new {
… …
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835 2791
2836 $row++; 2792 $row++;
2837 } 2793 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845} 2794}
2846 2795
2847############################################################################# 2796#############################################################################
2848 2797
2849package CFClient::UI::Menu; 2798package CFClient::UI::Menu;
… …
3035use CFClient::OpenGL; 2984use CFClient::OpenGL;
3036 2985
3037sub new { 2986sub new {
3038 my $class = shift; 2987 my $class = shift;
3039 2988
3040 $class->SUPER::new ( 2989 my $self = $class->SUPER::new (
2990 visible => 1,
3041 @_, 2991 @_,
3042 ) 2992 );
2993
2994 Scalar::Util::weaken ($self->{root} = $self);
2995
2996 $self
3043} 2997}
3044 2998
3045sub configure { 2999sub configure {
3046 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
3047 3001
3048 $self->{w} = $w; 3002 $self->{w} = $w;
3049 $self->{h} = $h; 3003 $self->{h} = $h;
3050} 3004}
3051 3005
3052sub check_size { 3006sub reconfigure {
3053 my ($self) = @_; 3007 my ($self) = @_;
3054 3008
3009 $self->SUPER::reconfigure;
3010
3055 $self->size_allocate ($self->{w}, $self->{h}) 3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3056 if $self->{w}; 3012 if $self->{w};
3057} 3013}
3058 3014
3059sub size_request { 3015sub size_request {
3060 my ($self) = @_; 3016 my ($self) = @_;
3061 3017
3062 ($self->{w}, $self->{h}) 3018 ($self->{w}, $self->{h})
3063} 3019}
3064 3020
3065sub size_allocate { 3021sub size_allocate {
3066 my ($self, $w, $h) = @_; 3022 my ($self, $w, $h, $changed) = @_;
3067 3023
3068 for my $child ($self->children) { 3024 for my $child ($self->children) {
3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070 3026
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3072 if exists $child->{req_x}; 3028 if exists $child->{req_x};
3073 3029
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3075 if exists $child->{req_y}; 3031 if exists $child->{req_y};
3076 3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3037
3080 $child->configure ($X, $Y, $W, $H); 3038 $child->configure ($X, $Y, $W, $H);
3081 } 3039 }
… …
3094} 3052}
3095 3053
3096sub update { 3054sub update {
3097 my ($self) = @_; 3055 my ($self) = @_;
3098 3056
3099 $self->check_size;
3100 $::WANT_REFRESH++; 3057 $::WANT_REFRESH++;
3101} 3058}
3102 3059
3103sub add { 3060sub add {
3104 my ($self, @children) = @_; 3061 my ($self, @children) = @_;
3105
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111 3062
3112 for my $child (@children) { 3063 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3064 $child->{is_toplevel} = 1;
3114 3065
3115 # integerise window positions 3066 # integerise window positions
… …
3150 while ($self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
3151 $_->() 3102 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3103 for values %{delete $self->{refresh_hook}};
3153 } 3104 }
3154 3105
3155 if ($self->{check_size}) { 3106 if ($self->{realloc}) {
3156 my @queue = ([], []); 3107 my @queue;
3157 3108
3158 for (;;) { 3109 while () {
3159 if ($self->{check_size}) { 3110 if ($self->{realloc}) {
3160 # heuristic: check containers last 3111 #TODO use array-of-depth approach
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3112
3162 for values %{delete $self->{check_size}} 3113 @queue = sort { $a->{visible} <=> $b->{visible} }
3114 @queue, values %{delete $self->{realloc}};
3163 } 3115 }
3164 3116
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3117 my $widget = pop @queue || last;
3166 3118
3119 $widget->{visible} or last; # do not resize invisible widgets
3120
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3168 ? @$widget{qw(user_w user_h)} 3122 ? @$widget{qw(def_w def_h)}
3169 : $widget->size_request; 3123 : $widget->size_request;
3170 3124
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 3126
3175 $widget->{req_w} = $w; 3127 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 3128 $widget->{req_h} = $h;
3177 3129
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3179 3131
3180 $widget->{parent}->check_size 3132 push @queue, $widget->{parent}
3181 if $widget->{parent}; 3133 if $widget->{parent};
3182 }
3183 } 3134 }
3184 } 3135 }
3185 3136
3186 while ($self->{size_alloc}) { 3137 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3188 my ($widget, $w, $h) = @$_; 3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
3189 3143
3190 $w = 0 if $w < 0; 3144 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0; 3145 $h = 0 if $h < 0;
3192 3146
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148
3193 $widget->{w} = $w; 3149 $widget->{w} = $w;
3194 $widget->{h} = $h; 3150 $widget->{h} = $h;
3151
3195 $widget->emit (size_allocate => $w, $h); 3152 $widget->emit (size_allocate => $w, $h, $changed);
3196 } 3153 }
3197 } 3154 }
3198 3155
3199 while ($self->{post_alloc_hook}) { 3156 while ($self->{post_alloc_hook}) {
3200 $_->() 3157 $_->()

Diff Legend

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