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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %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}
19 38
20sub check_tooltip { 39sub check_tooltip {
21 if (!$GRAB) { 40 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
24 43
25 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
26 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
27 48
28 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
29 50
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 52
32 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 54 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 55 }
44 56
45 return; 57 return;
46 } 58 }
47 } 59 }
… …
156 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 169 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 170 $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}; 171 $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}; 172 $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};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 173 $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}; 174 $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}; 175 $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};
166 } 176 }
167 } 177 }
168 178
169 reconfigure_widgets; 179 reconfigure_widgets;
170} 180}
… …
187 can_events => 1, 197 can_events => 1,
188 @_ 198 @_
189 }, $class; 199 }, $class;
190 200
191 for (keys %$self) { 201 for (keys %$self) {
192 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
194 } 204 }
195 } 205 }
196 206
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH;
211 $self->{req_y} = $layout->{y} * $::HEIGHT;
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
214 }
215
199 $self 216 $self
200} 217}
201 218
202sub destroy { 219sub destroy {
203 my ($self) = @_; 220 my ($self) = @_;
… …
206 %$self = (); 223 %$self = ();
207} 224}
208 225
209sub show { 226sub show {
210 my ($self) = @_; 227 my ($self) = @_;
228
211 return if $self->{parent}; 229 return if $self->{parent};
212 230
213 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
214} 232}
215 233
216sub show_centered { 234sub center {
217 my ($self) = @_; 235 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221 236
222 $CFClient::UI::ROOT->on_post_alloc ( 237 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub { 238 "center_$self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225 }, 240 },
226 ); 241 );
242
243 $self->update;
244}
245
246sub set_visible {
247 my ($self) = @_;
248
249 return if $self->{visible};
250
251 $self->{root} = $self->{parent}{root};
252 $self->{visible} = $self->{parent}{visible} + 1;
253
254 $self->emit (visibility_change => 1);
255
256 $self->realloc if !exists $self->{req_w};
257
258 $_->set_visible for $self->children;
227} 259}
228 260
229sub set_invisible { 261sub set_invisible {
230 my ($self) = @_; 262 my ($self) = @_;
231 263
232 # broken show/hide model 264 return unless $self->{visible};
265
266 $_->set_invisible for $self->children;
233 267
234 delete $self->{root}; 268 delete $self->{root};
235 delete $self->{visible}; 269 delete $self->{visible};
236 270
237 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
239 273
240 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
242 276
243 $self->focus_out; 277 $self->focus_out;
278
279 $self->emit (visibility_change => 0);
280}
281
282sub set_visibility {
283 my ($self, $visible) = @_;
284
285 return if $self->{visible} == $visible;
286
287 $visible ? $self->hide
288 : $self->show;
289}
290
291sub toggle_visibility {
292 my ($self) = @_;
293
294 $self->{visible}
295 ? $self->hide
296 : $self->show;
244} 297}
245 298
246sub hide { 299sub hide {
247 my ($self) = @_; 300 my ($self) = @_;
248 301
… …
263} 316}
264 317
265sub set_size { 318sub set_size {
266 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
267 320
268 $self->{user_w} = $w; 321 $self->{def_w} = $w;
269 $self->{user_h} = $h; 322 $self->{def_h} = $h;
270 323
271 $self->check_size; 324 $self->realloc;
272} 325}
273 326
274sub size_request { 327sub size_request {
275 require Carp; 328 require Carp;
276 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
296 $self->{y} = $y; 349 $self->{y} = $y;
297 $self->update; 350 $self->update;
298 } 351 }
299 352
300 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
301 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
302 } 357 }
303} 358}
304 359
305sub size_allocate { 360sub size_allocate {
306 # nothing to be done 361 # nothing to be done
307}
308
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314} 362}
315 363
316sub children { 364sub children {
317} 365}
318 366
… …
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
400sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449
450sub find_widget {
451 my ($self, $x, $y) = @_;
452
453 return () unless $self->{can_events};
454
455 return $self
456 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
457 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
458
459 ()
460}
461
462sub set_parent {
463 my ($self, $parent) = @_;
464
465 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible};
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc {
494 my ($self) = @_;
495
496 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self};
498
499 $self->{root}{realloc}{$self} = $self;
500 $self->{root}->update;
501 } else {
502 delete $self->{req_w};
503 }
504}
505
506sub update {
507 my ($self) = @_;
508
509 $self->{parent}->update
510 if $self->{parent};
511}
401 512
402sub draw { 513sub draw {
403 my ($self) = @_; 514 my ($self) = @_;
404 515
405 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
443 my ($self) = @_; 554 my ($self) = @_;
444 555
445 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
446} 557}
447 558
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506}
507
508sub DESTROY { 559sub DESTROY {
509 my ($self) = @_; 560 my ($self) = @_;
510 561
511 delete $WIDGET{$self+0}; 562 delete $WIDGET{$self+0};
512 #$self->deactivate; 563 #$self->deactivate;
… …
607 $self->{children} = [ 658 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
610 ]; 661 ];
611 662
612 $self->check_size (1); 663 $self->realloc;
613 $self->update;
614} 664}
615 665
616sub children { 666sub children {
617 @{ $_[0]{children} } 667 @{ $_[0]{children} }
618} 668}
… …
623 delete $child->{parent}; 673 delete $child->{parent};
624 $child->hide; 674 $child->hide;
625 675
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 677
628 $self->check_size (1); 678 $self->realloc;
629 $self->update;
630} 679}
631 680
632sub clear { 681sub clear {
633 my ($self) = @_; 682 my ($self) = @_;
634 683
… …
638 for (@$children) { 687 for (@$children) {
639 delete $_->{parent}; 688 delete $_->{parent};
640 $_->hide; 689 $_->hide;
641 } 690 }
642 691
643 $self->check_size; 692 $self->realloc;
644 $self->update;
645} 693}
646 694
647sub find_widget { 695sub find_widget {
648 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
649 697
… …
702sub size_request { 750sub size_request {
703 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
704} 752}
705 753
706sub size_allocate { 754sub size_allocate {
707 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
708 756
709 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
710} 758}
711 759
712############################################################################# 760#############################################################################
… …
729 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
730 $self->SUPER::update; 778 $self->SUPER::update;
731} 779}
732 780
733sub size_allocate { 781sub size_allocate {
734 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
735 783
736 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
737 $self->update; 785 $self->update
786 if $changed;
738} 787}
739 788
740sub _render { 789sub _render {
741 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
742} 791}
… …
786} 835}
787 836
788sub size_request { 837sub size_request {
789 my ($self) = @_; 838 my ($self) = @_;
790 839
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
792 841
793 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
794} 846}
795 847
796sub size_allocate { 848sub size_allocate {
797 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
798 850
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
801 853
802 $self->child->configure (0, 0, $w, $h); 854 $self->child->configure (0, 0, $w, $h);
… …
858 my $class = shift; 910 my $class = shift;
859 911
860 my $self; 912 my $self;
861 913
862 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
863 vertical => 1, 915 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 917 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 918 $self->{vp}->set_offset (0, $_[1]);
867 }, 919 },
868 ; 920 ;
869 921
870 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
… …
889 my $child = $self->{vp}->child; 941 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
891} 943}
892 944
893sub size_allocate { 945sub size_allocate {
894 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
895 947
896 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
897 949
898 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
899 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
900} 952}
901 953
… …
948 1000
949our @ISA = CFClient::UI::Bin::; 1001our @ISA = CFClient::UI::Bin::;
950 1002
951use CFClient::OpenGL; 1003use CFClient::OpenGL;
952 1004
953my @tex = 1005my $bg =
1006 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1007 mipmap => 1, wrap => 1;
1008
1009my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
956 1012
957sub new { 1013sub new {
958 my $class = shift; 1014 my $class = shift;
959
960 # TODO: user_x, user_y, overwrite moveto?
961 1015
962 my $self = $class->SUPER::new ( 1016 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1017 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1018 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1019 border => 0.6,
… …
991 $h + $self->border * 2, 1045 $h + $self->border * 2,
992 ) 1046 )
993} 1047}
994 1048
995sub size_allocate { 1049sub size_allocate {
996 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h, $changed) = @_;
1051
1052 return unless $changed;
997 1053
998 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
1000 1056
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1025 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
1026 1082
1027 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
1029 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
1033 $self->check_size; 1091 $self->realloc;
1034 }; 1092 };
1035 1093
1036 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1098 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
1042 1100
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1102
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1046 $self->update; 1107 $self->realloc;
1047 }; 1108 };
1048 } 1109 }
1049} 1110}
1050 1111
1051sub button_up { 1112sub button_up {
… …
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1132
1072 my $border = $self->border; 1133 my $border = $self->border;
1073 1134
1074 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1136 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1137 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1138 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1139 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1140
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1142 glColor @{ $self->{bg} };
1082 1143
1083 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
1145 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1146 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1147 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1149 }
1094 1150
1095 glDisable GL_TEXTURE_2D; 1151 glDisable GL_TEXTURE_2D;
1096 1152
… …
1126 my ($self, $x, $y, $child) = @_; 1182 my ($self, $x, $y, $child) = @_;
1127 1183
1128 $child->set_parent ($self); 1184 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1185 $self->{children}[$y][$x] = $child;
1130 1186
1131 $self->check_size (1); 1187 $self->realloc;
1132} 1188}
1133 1189
1134# TODO: move to container class maybe? send children a signal on removal? 1190# TODO: move to container class maybe? send children a signal on removal?
1135sub clear { 1191sub clear {
1136 my ($self) = @_; 1192 my ($self) = @_;
… …
1141 for (@children) { 1197 for (@children) {
1142 delete $_->{parent}; 1198 delete $_->{parent};
1143 $_->hide; 1199 $_->hide;
1144 } 1200 }
1145 1201
1146 $self->check_size (1); 1202 $self->realloc;
1147 $self->update;
1148} 1203}
1149 1204
1150sub get_wh { 1205sub get_wh {
1151 my ($self) = @_; 1206 my ($self) = @_;
1152 1207
… …
1179 (sum @$hs), 1234 (sum @$hs),
1180 ) 1235 )
1181} 1236}
1182 1237
1183sub size_allocate { 1238sub size_allocate {
1184 my ($self, $w, $h) = @_; 1239 my ($self, $w, $h, $changed) = @_;
1185 1240
1186 my ($ws, $hs) = $self->get_wh; 1241 my ($ws, $hs) = $self->get_wh;
1187 1242
1188 my $req_w = (sum @$ws) || 1; 1243 my $req_w = (sum @$ws) || 1;
1189 my $req_h = (sum @$hs) || 1; 1244 my $req_h = (sum @$hs) || 1;
… …
1248 } 1303 }
1249} 1304}
1250 1305
1251############################################################################# 1306#############################################################################
1252 1307
1308package CFClient::UI::Box;
1309
1310our @ISA = CFClient::UI::Container::;
1311
1312sub size_request {
1313 my ($self) = @_;
1314
1315 $self->{vertical}
1316 ? (
1317 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 )
1320 : (
1321 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 )
1324}
1325
1326sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_;
1328
1329 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children};
1331
1332 my @req;
1333
1334 if ($self->{homogeneous}) {
1335 @req = ($space / (@$children || 1)) x @$children;
1336 } else {
1337 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1338 my $req = List::Util::sum @req;
1339
1340 if ($req > $space) {
1341 # ah well, not enough space
1342 $_ *= $space / $req for @req;
1343 } else {
1344 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1345
1346 $space = ($space - $req) / $expand; # remaining space to give away
1347
1348 $req[$_] += $space * $children->[$_]{expand}
1349 for 0 .. $#$children;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@req;
1354
1355 my $pos = 0;
1356 for (0 .. $#$children) {
1357 my $alloc = $req[$_];
1358 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1359
1360 $pos += $alloc;
1361 }
1362
1363 1
1364}
1365
1366#############################################################################
1367
1253package CFClient::UI::HBox; 1368package CFClient::UI::HBox;
1254 1369
1255# TODO: wrap into common Box base class
1256
1257our @ISA = CFClient::UI::Container::; 1370our @ISA = CFClient::UI::Box::;
1258 1371
1259sub size_request { 1372sub new {
1260 my ($self) = @_; 1373 my $class = shift;
1261 1374
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1375 $class->SUPER::new (
1263 1376 vertical => 0,
1264 ( 1377 @_,
1265 (List::Util::sum map $_->[0], @alloc),
1266 (List::Util::max map $_->[1], @alloc),
1267 ) 1378 )
1268} 1379}
1269 1380
1270sub size_allocate {
1271 my ($self, $w, $h) = @_;
1272
1273 ($h, $w) = ($w, $h);
1274
1275 my $children = $self->{children};
1276
1277 my @h = map $_->{req_w}, @$children;
1278
1279 my $req_h = List::Util::sum @h;
1280
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } else {
1285 my $exp = List::Util::sum map $_->{expand}, @$children;
1286 $exp ||= 1;
1287
1288 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 }
1295 }
1296
1297 CFClient::UI::harmonize \@h;
1298
1299 my $y = 0;
1300 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_];
1303 $child->configure ($y, 0, $h, $w);
1304
1305 $y += $h;
1306 }
1307
1308 1
1309}
1310
1311############################################################################# 1381#############################################################################
1312 1382
1313package CFClient::UI::VBox; 1383package CFClient::UI::VBox;
1314 1384
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1385our @ISA = CFClient::UI::Box::;
1318 1386
1319sub size_request { 1387sub new {
1320 my ($self) = @_; 1388 my $class = shift;
1321 1389
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1390 $class->SUPER::new (
1323 1391 vertical => 1,
1324 ( 1392 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1393 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1394}
1368 1395
1369############################################################################# 1396#############################################################################
1370 1397
1371package CFClient::UI::Label; 1398package CFClient::UI::Label;
… …
1434 $self->{text} = "T$text"; 1461 $self->{text} = "T$text";
1435 1462
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1464 $self->{layout}->set_text ($text);
1438 1465
1466 $self->realloc;
1439 $self->update; 1467 $self->update;
1440 $self->check_size;
1441} 1468}
1442 1469
1443sub set_markup { 1470sub set_markup {
1444 my ($self, $markup) = @_; 1471 my ($self, $markup) = @_;
1445 1472
… …
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1476 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1477
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1452 $self->{layout}->set_markup ($markup); 1479 $self->{layout}->set_markup ($markup);
1453 1480
1481 $self->realloc;
1454 $self->update; 1482 $self->update;
1455 $self->check_size;
1456} 1483}
1457 1484
1458sub size_request { 1485sub size_request {
1459 my ($self) = @_; 1486 my ($self) = @_;
1460 1487
… …
1481 $h + $self->{padding} * 2, 1508 $h + $self->{padding} * 2,
1482 ) 1509 )
1483} 1510}
1484 1511
1485sub size_allocate { 1512sub size_allocate {
1486 my ($self, $w, $h) = @_; 1513 my ($self, $w, $h, $changed) = @_;
1487 1514
1488 delete $self->{texture}; 1515 delete $self->{texture}
1516 if $changed;
1489} 1517}
1490 1518
1491sub set_fontsize { 1519sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1520 my ($self, $fontsize) = @_;
1493 1521
1494 $self->{fontsize} = $fontsize; 1522 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1523 delete $self->{texture};
1496 1524
1497 $self->update; 1525 $self->realloc;
1498 $self->check_size;
1499} 1526}
1500 1527
1501sub _draw { 1528sub _draw {
1502 my ($self) = @_; 1529 my ($self) = @_;
1503 1530
… …
1583sub set_text { 1610sub set_text {
1584 my ($self, $text) = @_; 1611 my ($self, $text) = @_;
1585 1612
1586 $self->{cursor} = length $text; 1613 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1614 $self->_set_text ($text);
1588 $self->update; 1615
1589 $self->check_size; 1616 $self->realloc;
1590} 1617}
1591 1618
1592sub get_text { 1619sub get_text {
1593 $_[0]{text} 1620 $_[0]{text}
1594} 1621}
… …
1627 } elsif ($uni) { 1654 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1655 substr $text, $self->{cursor}++, 0, chr $uni;
1629 } 1656 }
1630 1657
1631 $self->_set_text ($text); 1658 $self->_set_text ($text);
1632 $self->update; 1659
1633 $self->check_size; 1660 $self->realloc;
1634} 1661}
1635 1662
1636sub focus_in { 1663sub focus_in {
1637 my ($self) = @_; 1664 my ($self) = @_;
1638 1665
… …
2145 $self->update; 2172 $self->update;
2146 2173
2147 $self 2174 $self
2148} 2175}
2149 2176
2177sub changed { }
2178
2150sub set_range { 2179sub set_range {
2151 my ($self, $range) = @_; 2180 my ($self, $range) = @_;
2152 2181
2153 ($range, $self->{range}) = ($self->{range}, $range); 2182 ($range, $self->{range}) = ($self->{range}, $range);
2154 2183
… …
2343 $self->{fontsize} = $fontsize; 2372 $self->{fontsize} = $fontsize;
2344 $self->reflow; 2373 $self->reflow;
2345} 2374}
2346 2375
2347sub size_allocate { 2376sub size_allocate {
2348 my ($self, $w, $h) = @_; 2377 my ($self, $w, $h, $changed) = @_;
2349 2378
2350 $self->SUPER::size_allocate ($w, $h); 2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2351 2382
2352 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2383 $self->{layout}->set_font ($self->{font}) if $self->{font};
2353 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2354 $self->{layout}->set_width ($self->{children}[0]{w}); 2385 $self->{layout}->set_width ($self->{children}[0]{w});
2355 2386
… …
2544 2575
2545sub new { 2576sub new {
2546 my $class = shift; 2577 my $class = shift;
2547 2578
2548 my $self = $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2549 state => 0, 2580 state => 0,
2550 connect_activate => \&toggle_flopper, 2581 on_activate => \&toggle_flopper,
2551 @_ 2582 @_
2552 ); 2583 );
2553 2584
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2585 $self
2560} 2586}
2561 2587
2562sub toggle_flopper { 2588sub toggle_flopper {
2563 my ($self) = @_; 2589 my ($self) = @_;
2564 2590
2565 # TODO: use animation 2591 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2592}
2577 2593
2578############################################################################# 2594#############################################################################
2579 2595
2580package CFClient::UI::Tooltip; 2596package CFClient::UI::Tooltip;
… …
2612 2628
2613 ($w + 4, $h + 4) 2629 ($w + 4, $h + 4)
2614} 2630}
2615 2631
2616sub size_allocate { 2632sub size_allocate {
2617 my ($self, $w, $h) = @_; 2633 my ($self, $w, $h, $changed) = @_;
2618 2634
2635 return unless $changed;
2636
2619 $self->SUPER::size_allocate ($w - 4, $h - 4); 2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2638}
2639
2640sub visibility_change {
2641 my ($self, $visible) = @_;
2642
2643 return unless $visible;
2644
2645 $self->{root}->on_post_alloc ("move_$self" => sub {
2646 my $widget = $self->{owner}
2647 or return;
2648
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH;
2653
2654 $self->move ($x, $y);
2655 });
2620} 2656}
2621 2657
2622sub _draw { 2658sub _draw {
2623 my ($self) = @_; 2659 my ($self) = @_;
2624 2660
… …
2641 glVertex $w, $h; 2677 glVertex $w, $h;
2642 glVertex $w, 0; 2678 glVertex $w, 0;
2643 glEnd; 2679 glEnd;
2644 2680
2645 glTranslate 2 - 0.375, 2 - 0.375; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2682
2646 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2647} 2684}
2648 2685
2649############################################################################# 2686#############################################################################
2650 2687
… …
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766 2803
2767 $row++; 2804 $row++;
2768 } 2805 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774} 2806}
2775 2807
2776############################################################################# 2808#############################################################################
2777 2809
2778package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
2964use CFClient::OpenGL; 2996use CFClient::OpenGL;
2965 2997
2966sub new { 2998sub new {
2967 my $class = shift; 2999 my $class = shift;
2968 3000
2969 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
2970 visible => 1, 3002 visible => 1,
2971 @_, 3003 @_,
2972 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
2973} 3009}
2974 3010
2975sub configure { 3011sub configure {
2976 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
2977 3013
2978 $self->{w} = $w; 3014 $self->{w} = $w;
2979 $self->{h} = $h; 3015 $self->{h} = $h;
2980} 3016}
2981 3017
2982sub check_size { 3018sub reconfigure {
2983 my ($self) = @_; 3019 my ($self) = @_;
2984 3020
3021 $self->SUPER::reconfigure;
3022
2985 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
2986 if $self->{w}; 3024 if $self->{w};
2987} 3025}
2988 3026
2989sub size_request { 3027sub size_request {
2990 my ($self) = @_; 3028 my ($self) = @_;
2991 3029
2992 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
2993} 3031}
2994 3032
2995sub size_allocate { 3033sub size_allocate {
2996 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
2997 3035
2998 for my $child ($self->children) { 3036 for my $child ($self->children) {
2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3000 3038
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3002 if exists $child->{req_x}; 3040 if exists $child->{req_x};
3003 3041
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3005 if exists $child->{req_y}; 3043 if exists $child->{req_y};
3006 3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3049
3010 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
3011 } 3051 }
… …
3024} 3064}
3025 3065
3026sub update { 3066sub update {
3027 my ($self) = @_; 3067 my ($self) = @_;
3028 3068
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
3031} 3070}
3032 3071
3033sub add { 3072sub add {
3034 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
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 3074
3042 for my $child (@children) { 3075 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3076 $child->{is_toplevel} = 1;
3044 3077
3045 # integerise window positions 3078 # integerise window positions
… …
3080 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
3081 $_->() 3114 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
3083 } 3116 }
3084 3117
3085 if ($self->{check_size}) { 3118 if ($self->{realloc}) {
3086 my @queue = ([], []); 3119 my @queue;
3087 3120
3088 for (;;) { 3121 while () {
3089 if ($self->{check_size}) { 3122 if ($self->{realloc}) {
3090 # heuristic: check containers last 3123 #TODO use array-of-depth approach
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3124
3092 for values %{delete $self->{check_size}} 3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3126 @queue, values %{delete $self->{realloc}};
3093 } 3127 }
3094 3128
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3129 my $widget = pop @queue || last;
3096 3130
3131 $widget->{visible} or last; # do not resize invisible widgets
3132
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3098 ? @$widget{qw(user_w user_h)} 3134 ? @$widget{qw(def_w def_h)}
3099 : $widget->size_request; 3135 : $widget->size_request;
3100 3136
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 3138
3105 $widget->{req_w} = $w; 3139 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3140 $widget->{req_h} = $h;
3107 3141
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3109 3143
3110 $widget->{parent}->check_size 3144 push @queue, $widget->{parent}
3111 if $widget->{parent}; 3145 if $widget->{parent};
3112 }
3113 } 3146 }
3114 } 3147 }
3115 3148
3116 while ($self->{size_alloc}) { 3149 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3118 my ($widget, $w, $h) = @$_; 3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3119 3155
3120 $w = 0 if $w < 0; 3156 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3157 $h = 0 if $h < 0;
3122 3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3123 $widget->{w} = $w; 3161 $widget->{w} = $w;
3124 $widget->{h} = $h; 3162 $widget->{h} = $h;
3163
3125 $widget->emit (size_allocate => $w, $h); 3164 $widget->emit (size_allocate => $w, $h, $changed);
3126 } 3165 }
3127 } 3166 }
3128 3167
3129 while ($self->{post_alloc_hook}) { 3168 while ($self->{post_alloc_hook}) {
3130 $_->() 3169 $_->()

Diff Legend

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