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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 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}) {
23 43
24 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide;
46
25 $TOOLTIP->{owner} = $widget; 47 $TOOLTIP->{owner} = $widget;
26 48
27 my $tip = $widget->{tooltip}; 49 my $tip = $widget->{tooltip};
28 50
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 51 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 52
31 $TOOLTIP->set_tooltip_from ($widget); 53 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 54 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 55 }
43 56
44 return; 57 return;
45 } 58 }
46 } 59 }
… …
155 for my $widget (values %WIDGET) { 168 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 169 if ($widget->{is_toplevel}) {
157 $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};
158 $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};
159 $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};
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}; 173 $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}; 174 $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}; 175 $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 } 176 }
166 } 177 }
167 178
168 reconfigure_widgets; 179 reconfigure_widgets;
169} 180}
… …
186 can_events => 1, 197 can_events => 1,
187 @_ 198 @_
188 }, $class; 199 }, $class;
189 200
190 for (keys %$self) { 201 for (keys %$self) {
191 if (/^connect_(.*)$/) { 202 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 203 $self->connect ($1 => delete $self->{$_});
193 } 204 }
194 } 205 }
195 206
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 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
198 $self 216 $self
199} 217}
200 218
201sub destroy { 219sub destroy {
202 my ($self) = @_; 220 my ($self) = @_;
… …
205 %$self = (); 223 %$self = ();
206} 224}
207 225
208sub show { 226sub show {
209 my ($self) = @_; 227 my ($self) = @_;
228
210 return if $self->{parent}; 229 return if $self->{parent};
211 230
212 $CFClient::UI::ROOT->add ($self); 231 $CFClient::UI::ROOT->add ($self);
213} 232}
214 233
215sub show_centered { 234sub center {
216 my ($self) = @_; 235 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 236
221 $CFClient::UI::ROOT->on_post_alloc ( 237 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 238 "center_$self" => sub {
223 $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);
224 }, 240 },
225 ); 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;
226} 259}
227 260
228sub set_invisible { 261sub set_invisible {
229 my ($self) = @_; 262 my ($self) = @_;
230 263
231 # broken show/hide model 264 return unless $self->{visible};
232 265
266 $_->set_invisible for $self->children;
267
268 delete $self->{root};
233 delete $self->{visible}; 269 delete $self->{visible};
234 270
235 undef $GRAB if $GRAB == $self; 271 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 272 undef $HOVER if $HOVER == $self;
237 273
238 CFClient::UI::check_tooltip 274 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 275 if $TOOLTIP->{owner} == $self;
240 276
241 $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;
242} 297}
243 298
244sub hide { 299sub hide {
245 my ($self) = @_; 300 my ($self) = @_;
246 301
… …
261} 316}
262 317
263sub set_size { 318sub set_size {
264 my ($self, $w, $h) = @_; 319 my ($self, $w, $h) = @_;
265 320
266 $self->{user_w} = $w; 321 $self->{def_w} = $w;
267 $self->{user_h} = $h; 322 $self->{def_h} = $h;
268 323
269 $self->check_size; 324 $self->realloc;
270} 325}
271 326
272sub size_request { 327sub size_request {
273 require Carp; 328 require Carp;
274 Carp::confess "size_request is abstract"; 329 Carp::confess "size_request is abstract";
… …
294 $self->{y} = $y; 349 $self->{y} = $y;
295 $self->update; 350 $self->update;
296 } 351 }
297 352
298 if ($self->{w} != $w || $self->{h} != $h) { 353 if ($self->{w} != $w || $self->{h} != $h) {
354 return unless $self->{visible};
355
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 357 }
301} 358}
302 359
303sub size_allocate { 360sub size_allocate {
304 # nothing to be done 361 # nothing to be done
305}
306
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312} 362}
313 363
314sub children { 364sub children {
315} 365}
316 366
… …
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub 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}
399 512
400sub draw { 513sub draw {
401 my ($self) = @_; 514 my ($self) = @_;
402 515
403 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
441 my ($self) = @_; 554 my ($self) = @_;
442 555
443 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
444} 557}
445 558
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 { 559sub DESTROY {
504 my ($self) = @_; 560 my ($self) = @_;
505 561
506 delete $WIDGET{$self+0}; 562 delete $WIDGET{$self+0};
507 #$self->deactivate; 563 #$self->deactivate;
… …
602 $self->{children} = [ 658 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
605 ]; 661 ];
606 662
607 $self->check_size (1); 663 $self->realloc;
608 $self->update;
609} 664}
610 665
611sub children { 666sub children {
612 @{ $_[0]{children} } 667 @{ $_[0]{children} }
613} 668}
… …
618 delete $child->{parent}; 673 delete $child->{parent};
619 $child->hide; 674 $child->hide;
620 675
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 677
623 $self->check_size (1); 678 $self->realloc;
624 $self->update;
625} 679}
626 680
627sub clear { 681sub clear {
628 my ($self) = @_; 682 my ($self) = @_;
629 683
… …
633 for (@$children) { 687 for (@$children) {
634 delete $_->{parent}; 688 delete $_->{parent};
635 $_->hide; 689 $_->hide;
636 } 690 }
637 691
638 $self->check_size; 692 $self->realloc;
639 $self->update;
640} 693}
641 694
642sub find_widget { 695sub find_widget {
643 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
644 697
… …
697sub size_request { 750sub size_request {
698 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
699} 752}
700 753
701sub size_allocate { 754sub size_allocate {
702 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
703 756
704 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
705} 758}
706 759
707############################################################################# 760#############################################################################
… …
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 778 $self->SUPER::update;
726} 779}
727 780
728sub size_allocate { 781sub size_allocate {
729 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
730 783
731 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
732 $self->update; 785 $self->update
786 if $changed;
733} 787}
734 788
735sub _render { 789sub _render {
736 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
737} 791}
… …
781} 835}
782 836
783sub size_request { 837sub size_request {
784 my ($self) = @_; 838 my ($self) = @_;
785 839
786 @$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)};
787 841
788 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
789} 846}
790 847
791sub size_allocate { 848sub size_allocate {
792 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
793 850
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796 853
797 $self->child->configure (0, 0, $w, $h); 854 $self->child->configure (0, 0, $w, $h);
… …
853 my $class = shift; 910 my $class = shift;
854 911
855 my $self; 912 my $self;
856 913
857 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
858 vertical => 1, 915 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 917 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 918 $self->{vp}->set_offset (0, $_[1]);
862 }, 919 },
863 ; 920 ;
864 921
865 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
… …
873 $self->add ($self->{slider}); 930 $self->add ($self->{slider});
874 931
875 $self 932 $self
876} 933}
877 934
935sub update {
936 my ($self) = @_;
937
938 $self->SUPER::update;
939
940 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943}
944
878sub size_allocate { 945sub size_allocate {
879 my ($self, $w, $h) = @_; 946 my ($self, $w, $h, $changed) = @_;
880 947
881 $self->SUPER::size_allocate ($w, $h); 948 $self->SUPER::size_allocate ($w, $h, $changed);
882 949
883 my $child = $self->{vp}->child; 950 my $child = $self->{vp}->child;
884 $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]);
885} 952}
886 953
… …
933 1000
934our @ISA = CFClient::UI::Bin::; 1001our @ISA = CFClient::UI::Bin::;
935 1002
936use CFClient::OpenGL; 1003use CFClient::OpenGL;
937 1004
938my @tex = 1005my $bg =
1006 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1007 mipmap => 1, wrap => 1;
1008
1009my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1010 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); 1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1012
942sub new { 1013sub new {
943 my $class = shift; 1014 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1015
947 my $self = $class->SUPER::new ( 1016 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1017 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1018 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1019 border => 0.6,
… …
976 $h + $self->border * 2, 1045 $h + $self->border * 2,
977 ) 1046 )
978} 1047}
979 1048
980sub size_allocate { 1049sub size_allocate {
981 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h, $changed) = @_;
1051
1052 return unless $changed;
982 1053
983 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
985 1056
986 $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)
… …
1010 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
1011 1082
1012 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
1014 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1091 $self->realloc;
1019 }; 1092 };
1020 1093
1021 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1098 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
1027 1100
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1102
1030 $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});
1031 $self->update; 1107 $self->realloc;
1032 }; 1108 };
1033 } 1109 }
1034} 1110}
1035 1111
1036sub button_up { 1112sub button_up {
… …
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1132
1057 my $border = $self->border; 1133 my $border = $self->border;
1058 1134
1059 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1136 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1137 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1138 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1139 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1140
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1142 glColor @{ $self->{bg} };
1067 1143
1068 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
1145 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1146 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1147 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1149 }
1079 1150
1080 glDisable GL_TEXTURE_2D; 1151 glDisable GL_TEXTURE_2D;
1081 1152
… …
1111 my ($self, $x, $y, $child) = @_; 1182 my ($self, $x, $y, $child) = @_;
1112 1183
1113 $child->set_parent ($self); 1184 $child->set_parent ($self);
1114 $self->{children}[$y][$x] = $child; 1185 $self->{children}[$y][$x] = $child;
1115 1186
1116 $self->check_size (1); 1187 $self->realloc;
1117} 1188}
1118 1189
1119# 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?
1120sub clear { 1191sub clear {
1121 my ($self) = @_; 1192 my ($self) = @_;
… …
1126 for (@children) { 1197 for (@children) {
1127 delete $_->{parent}; 1198 delete $_->{parent};
1128 $_->hide; 1199 $_->hide;
1129 } 1200 }
1130 1201
1131 $self->check_size (1); 1202 $self->realloc;
1132 $self->update;
1133} 1203}
1134 1204
1135sub get_wh { 1205sub get_wh {
1136 my ($self) = @_; 1206 my ($self) = @_;
1137 1207
… …
1164 (sum @$hs), 1234 (sum @$hs),
1165 ) 1235 )
1166} 1236}
1167 1237
1168sub size_allocate { 1238sub size_allocate {
1169 my ($self, $w, $h) = @_; 1239 my ($self, $w, $h, $changed) = @_;
1170 1240
1171 my ($ws, $hs) = $self->get_wh; 1241 my ($ws, $hs) = $self->get_wh;
1172 1242
1173 my $req_w = sum @$ws; 1243 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1244 my $req_h = (sum @$hs) || 1;
1175 1245
1176 # TODO: nicer code && do row_expand 1246 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1247 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1248 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1249 my $col_expand = (sum @col_expand) || 1;
… …
1233 } 1303 }
1234} 1304}
1235 1305
1236############################################################################# 1306#############################################################################
1237 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
1238package CFClient::UI::HBox; 1368package CFClient::UI::HBox;
1239 1369
1240# TODO: wrap into common Box base class
1241
1242our @ISA = CFClient::UI::Container::; 1370our @ISA = CFClient::UI::Box::;
1243 1371
1244sub size_request { 1372sub new {
1245 my ($self) = @_; 1373 my $class = shift;
1246 1374
1247 my @alloc = map [$_->size_request], @{$self->{children}}; 1375 $class->SUPER::new (
1248 1376 vertical => 0,
1249 ( 1377 @_,
1250 (List::Util::sum map $_->[0], @alloc),
1251 (List::Util::max map $_->[1], @alloc),
1252 ) 1378 )
1253} 1379}
1254 1380
1255sub size_allocate {
1256 my ($self, $w, $h) = @_;
1257
1258 ($h, $w) = ($w, $h);
1259
1260 my $children = $self->{children};
1261
1262 my @h = map $_->{req_w}, @$children;
1263
1264 my $req_h = List::Util::sum @h;
1265
1266 if ($req_h > $h) {
1267 # ah well, not enough space
1268 $_ *= $h / $req_h for @h;
1269 } else {
1270 my $exp = List::Util::sum map $_->{expand}, @$children;
1271 $exp ||= 1;
1272
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275
1276 my $alloc_h = $h[$_];
1277 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278 $h[$_] = $alloc_h;
1279 }
1280 }
1281
1282 CFClient::UI::harmonize \@h;
1283
1284 my $y = 0;
1285 for (0 .. $#$children) {
1286 my $child = $children->[$_];
1287 my $h = $h[$_];
1288 $child->configure ($y, 0, $h, $w);
1289
1290 $y += $h;
1291 }
1292
1293 1
1294}
1295
1296############################################################################# 1381#############################################################################
1297 1382
1298package CFClient::UI::VBox; 1383package CFClient::UI::VBox;
1299 1384
1300# TODO: wrap into common Box base class
1301
1302our @ISA = CFClient::UI::Container::; 1385our @ISA = CFClient::UI::Box::;
1303 1386
1304sub size_request { 1387sub new {
1305 my ($self) = @_; 1388 my $class = shift;
1306 1389
1307 my @alloc = map [$_->size_request], @{$self->{children}}; 1390 $class->SUPER::new (
1308 1391 vertical => 1,
1309 ( 1392 @_,
1310 (List::Util::max map $_->[0], @alloc),
1311 (List::Util::sum map $_->[1], @alloc),
1312 ) 1393 )
1313}
1314
1315sub size_allocate {
1316 my ($self, $w, $h) = @_;
1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320 my $children = $self->{children};
1321
1322 my @h = map $_->{req_h}, @$children;
1323
1324 my $req_h = List::Util::sum @h;
1325
1326 if ($req_h > $h) {
1327 # ah well, not enough space
1328 $_ *= $h / $req_h for @h;
1329 } else {
1330 my $exp = List::Util::sum map $_->{expand}, @$children;
1331 $exp ||= 1;
1332
1333 for (0 .. $#$children) {
1334 my $child = $children->[$_];
1335
1336 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure (0, $y, $w, $h);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352} 1394}
1353 1395
1354############################################################################# 1396#############################################################################
1355 1397
1356package CFClient::UI::Label; 1398package CFClient::UI::Label;
… …
1419 $self->{text} = "T$text"; 1461 $self->{text} = "T$text";
1420 1462
1421 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422 $self->{layout}->set_text ($text); 1464 $self->{layout}->set_text ($text);
1423 1465
1466 $self->realloc;
1424 $self->update; 1467 $self->update;
1425 $self->check_size;
1426} 1468}
1427 1469
1428sub set_markup { 1470sub set_markup {
1429 my ($self, $markup) = @_; 1471 my ($self, $markup) = @_;
1430 1472
… …
1434 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1476 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435 1477
1436 $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;
1437 $self->{layout}->set_markup ($markup); 1479 $self->{layout}->set_markup ($markup);
1438 1480
1481 $self->realloc;
1439 $self->update; 1482 $self->update;
1440 $self->check_size;
1441} 1483}
1442 1484
1443sub size_request { 1485sub size_request {
1444 my ($self) = @_; 1486 my ($self) = @_;
1445 1487
… …
1466 $h + $self->{padding} * 2, 1508 $h + $self->{padding} * 2,
1467 ) 1509 )
1468} 1510}
1469 1511
1470sub size_allocate { 1512sub size_allocate {
1471 my ($self, $w, $h) = @_; 1513 my ($self, $w, $h, $changed) = @_;
1472 1514
1473 delete $self->{texture}; 1515 delete $self->{texture}
1516 if $changed;
1474} 1517}
1475 1518
1476sub set_fontsize { 1519sub set_fontsize {
1477 my ($self, $fontsize) = @_; 1520 my ($self, $fontsize) = @_;
1478 1521
1479 $self->{fontsize} = $fontsize; 1522 $self->{fontsize} = $fontsize;
1480 delete $self->{texture}; 1523 delete $self->{texture};
1481 1524
1482 $self->update; 1525 $self->realloc;
1483 $self->check_size;
1484} 1526}
1485 1527
1486sub _draw { 1528sub _draw {
1487 my ($self) = @_; 1529 my ($self) = @_;
1488 1530
… …
1568sub set_text { 1610sub set_text {
1569 my ($self, $text) = @_; 1611 my ($self, $text) = @_;
1570 1612
1571 $self->{cursor} = length $text; 1613 $self->{cursor} = length $text;
1572 $self->_set_text ($text); 1614 $self->_set_text ($text);
1573 $self->update; 1615
1574 $self->check_size; 1616 $self->realloc;
1575} 1617}
1576 1618
1577sub get_text { 1619sub get_text {
1578 $_[0]{text} 1620 $_[0]{text}
1579} 1621}
… …
1612 } elsif ($uni) { 1654 } elsif ($uni) {
1613 substr $text, $self->{cursor}++, 0, chr $uni; 1655 substr $text, $self->{cursor}++, 0, chr $uni;
1614 } 1656 }
1615 1657
1616 $self->_set_text ($text); 1658 $self->_set_text ($text);
1617 $self->update; 1659
1618 $self->check_size; 1660 $self->realloc;
1619} 1661}
1620 1662
1621sub focus_in { 1663sub focus_in {
1622 my ($self) = @_; 1664 my ($self) = @_;
1623 1665
… …
2130 $self->update; 2172 $self->update;
2131 2173
2132 $self 2174 $self
2133} 2175}
2134 2176
2177sub changed { }
2178
2135sub set_range { 2179sub set_range {
2136 my ($self, $range) = @_; 2180 my ($self, $range) = @_;
2137 2181
2138 $self->{range} = $range; 2182 ($range, $self->{range}) = ($self->{range}, $range);
2139 2183
2140 $self->update; 2184 $self->update
2185 if "@$range" ne "@{$self->{range}}";
2141} 2186}
2142 2187
2143sub set_value { 2188sub set_value {
2144 my ($self, $value) = @_; 2189 my ($self, $value) = @_;
2145 2190
… …
2327 $self->{fontsize} = $fontsize; 2372 $self->{fontsize} = $fontsize;
2328 $self->reflow; 2373 $self->reflow;
2329} 2374}
2330 2375
2331sub size_allocate { 2376sub size_allocate {
2332 my ($self, $w, $h) = @_; 2377 my ($self, $w, $h, $changed) = @_;
2333 2378
2334 $self->SUPER::size_allocate ($w, $h); 2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2335 2382
2336 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2383 $self->{layout}->set_font ($self->{font}) if $self->{font};
2337 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2338 $self->{layout}->set_width ($self->{children}[0]{w}); 2385 $self->{layout}->set_width ($self->{children}[0]{w});
2339 2386
… …
2528 2575
2529sub new { 2576sub new {
2530 my $class = shift; 2577 my $class = shift;
2531 2578
2532 my $self = $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2533 state => 0, 2580 state => 0,
2534 connect_activate => \&toggle_flopper, 2581 on_activate => \&toggle_flopper,
2535 @_ 2582 @_
2536 ); 2583 );
2537 2584
2538 if ($self->{state}) {
2539 $self->{state} = 0;
2540 $self->toggle_flopper;
2541 }
2542
2543 $self 2585 $self
2544} 2586}
2545 2587
2546sub toggle_flopper { 2588sub toggle_flopper {
2547 my ($self) = @_; 2589 my ($self) = @_;
2548 2590
2549 # TODO: use animation 2591 $self->{other}->toggle_visibility;
2550 if ($self->{state} = !$self->{state}) {
2551 $CFClient::UI::ROOT->add ($self->{other});
2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2553 $self->_emit ("open");
2554 } else {
2555 $CFClient::UI::ROOT->remove ($self->{other});
2556 $self->_emit ("close");
2557 }
2558
2559 $self->_emit (changed => $self->{state});
2560} 2592}
2561 2593
2562############################################################################# 2594#############################################################################
2563 2595
2564package CFClient::UI::Tooltip; 2596package CFClient::UI::Tooltip;
… …
2596 2628
2597 ($w + 4, $h + 4) 2629 ($w + 4, $h + 4)
2598} 2630}
2599 2631
2600sub size_allocate { 2632sub size_allocate {
2601 my ($self, $w, $h) = @_; 2633 my ($self, $w, $h, $changed) = @_;
2602 2634
2635 return unless $changed;
2636
2603 $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 });
2604} 2656}
2605 2657
2606sub _draw { 2658sub _draw {
2607 my ($self) = @_; 2659 my ($self) = @_;
2608 2660
… …
2625 glVertex $w, $h; 2677 glVertex $w, $h;
2626 glVertex $w, 0; 2678 glVertex $w, 0;
2627 glEnd; 2679 glEnd;
2628 2680
2629 glTranslate 2 - 0.375, 2 - 0.375; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2682
2630 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2631} 2684}
2632 2685
2633############################################################################# 2686#############################################################################
2634 2687
… …
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750 2803
2751 $row++; 2804 $row++;
2752 } 2805 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760} 2806}
2761 2807
2762############################################################################# 2808#############################################################################
2763 2809
2764package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
2950use CFClient::OpenGL; 2996use CFClient::OpenGL;
2951 2997
2952sub new { 2998sub new {
2953 my $class = shift; 2999 my $class = shift;
2954 3000
2955 $class->SUPER::new ( 3001 my $self = $class->SUPER::new (
3002 visible => 1,
2956 @_, 3003 @_,
2957 ) 3004 );
3005
3006 Scalar::Util::weaken ($self->{root} = $self);
3007
3008 $self
2958} 3009}
2959 3010
2960sub configure { 3011sub configure {
2961 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
2962 3013
2963 $self->{w} = $w; 3014 $self->{w} = $w;
2964 $self->{h} = $h; 3015 $self->{h} = $h;
2965} 3016}
2966 3017
2967sub check_size { 3018sub reconfigure {
2968 my ($self) = @_; 3019 my ($self) = @_;
2969 3020
3021 $self->SUPER::reconfigure;
3022
2970 $self->size_allocate ($self->{w}, $self->{h}) 3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
2971 if $self->{w}; 3024 if $self->{w};
2972} 3025}
2973 3026
2974sub size_request { 3027sub size_request {
2975 my ($self) = @_; 3028 my ($self) = @_;
2976 3029
2977 ($self->{w}, $self->{h}) 3030 ($self->{w}, $self->{h})
2978} 3031}
2979 3032
2980sub size_allocate { 3033sub size_allocate {
2981 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h, $changed) = @_;
2982 3035
2983 for my $child ($self->children) { 3036 for my $child ($self->children) {
2984 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)};
2985 3038
2986 $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
2987 if exists $child->{req_x}; 3040 if exists $child->{req_x};
2988 3041
2989 $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
2990 if exists $child->{req_y}; 3043 if exists $child->{req_y};
2991 3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
2992 $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;
2993 $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;
2994 3049
2995 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
2996 } 3051 }
… …
3009} 3064}
3010 3065
3011sub update { 3066sub update {
3012 my ($self) = @_; 3067 my ($self) = @_;
3013 3068
3014 $self->check_size;
3015 $::WANT_REFRESH++; 3069 $::WANT_REFRESH++;
3016} 3070}
3017 3071
3018sub add { 3072sub add {
3019 my ($self, @children) = @_; 3073 my ($self, @children) = @_;
3020
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026 3074
3027 for my $child (@children) { 3075 for my $child (@children) {
3028 $child->{is_toplevel} = 1; 3076 $child->{is_toplevel} = 1;
3029 3077
3030 # integerise window positions 3078 # integerise window positions
… …
3065 while ($self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
3066 $_->() 3114 $_->()
3067 for values %{delete $self->{refresh_hook}}; 3115 for values %{delete $self->{refresh_hook}};
3068 } 3116 }
3069 3117
3070 if ($self->{check_size}) { 3118 if ($self->{realloc}) {
3071 my @queue = ([], []); 3119 my @queue;
3072 3120
3073 for (;;) { 3121 while () {
3074 if ($self->{check_size}) { 3122 if ($self->{realloc}) {
3075 # heuristic: check containers last 3123 #TODO use array-of-depth approach
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3124
3077 for values %{delete $self->{check_size}} 3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3126 @queue, values %{delete $self->{realloc}};
3078 } 3127 }
3079 3128
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3129 my $widget = pop @queue || last;
3081 3130
3131 $widget->{visible} or last; # do not resize invisible widgets
3132
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3083 ? @$widget{qw(user_w user_h)} 3134 ? @$widget{qw(def_w def_h)}
3084 : $widget->size_request; 3135 : $widget->size_request;
3085 3136
3086 if (delete $widget->{force_alloc}
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 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#
3089 3138
3090 $widget->{req_w} = $w; 3139 $widget->{req_w} = $w;
3091 $widget->{req_h} = $h; 3140 $widget->{req_h} = $h;
3092 3141
3093 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3094 3143
3095 $widget->{parent}->check_size 3144 push @queue, $widget->{parent}
3096 if $widget->{parent}; 3145 if $widget->{parent};
3097 }
3098 } 3146 }
3099 } 3147 }
3100 3148
3101 while ($self->{size_alloc}) { 3149 while (my $size_alloc = delete $self->{size_alloc}) {
3102 for (values %{delete $self->{size_alloc}}) { 3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3103 my ($widget, $w, $h) = @$_; 3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3104 3155
3105 $w = 0 if $w < 0; 3156 $w = 0 if $w < 0;
3106 $h = 0 if $h < 0; 3157 $h = 0 if $h < 0;
3107 3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3108 $widget->{w} = $w; 3161 $widget->{w} = $w;
3109 $widget->{h} = $h; 3162 $widget->{h} = $h;
3163
3110 $widget->emit (size_allocate => $w, $h); 3164 $widget->emit (size_allocate => $w, $h, $changed);
3111 } 3165 }
3112 } 3166 }
3113 3167
3114 while ($self->{post_alloc_hook}) { 3168 while ($self->{post_alloc_hook}) {
3115 $_->() 3169 $_->()

Diff Legend

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