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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
29 } 31 }
30 32
31 return $LAYOUT; 33 $layout
32} 34}
33 35
34sub set_layout { 36sub set_layout {
35 my ($layout) = @_; 37 my ($layout) = @_;
36 $LAYOUT = $layout; 38 $LAYOUT = $layout;
… …
40 if (!$GRAB) { 42 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
43 45
44 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
45 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
46 50
47 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
48 52
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 54
51 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 56 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 57 }
63 58
64 return; 59 return;
65 } 60 }
66 } 61 }
… …
172sub rescale_widgets { 167sub rescale_widgets {
173 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
174 169
175 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $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};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $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};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
183 } 185 }
184 } 186 }
185 187
186 reconfigure_widgets; 188 reconfigure_widgets;
187} 189}
… …
196 198
197sub new { 199sub new {
198 my $class = shift; 200 my $class = shift;
199 201
200 my $self = bless { 202 my $self = bless {
201 x => 0, 203 x => "center",
202 y => 0, 204 y => "center",
203 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
204 can_events => 1, 208 can_events => 1,
205 @_ 209 @_
206 }, $class; 210 }, $class;
211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 223
208 for (keys %$self) { 224 for (keys %$self) {
209 if (/^on_(.*)$/) { 225 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
211 } 227 }
212 } 228 }
213 229
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
223 $self 230 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 231}
235 232
236sub destroy { 233sub destroy {
237 my ($self) = @_; 234 my ($self) = @_;
238 235
… …
240 %$self = (); 237 %$self = ();
241} 238}
242 239
243sub show { 240sub show {
244 my ($self) = @_; 241 my ($self) = @_;
242
245 return if $self->{parent}; 243 return if $self->{parent};
246 244
247 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
248}
249
250sub center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 246}
261 247
262sub set_visible { 248sub set_visible {
263 my ($self) = @_; 249 my ($self) = @_;
264 250
265 return if $self->{visible}; 251 return if $self->{visible};
266 252
267 $self->{root} = $self->{parent}{root}; 253 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 254 $self->{visible} = $self->{parent}{visible} + 1;
269 255
270 $self->emit (visibility_change => 1) 256 $self->emit (visibility_change => 1);
257
258 $self->realloc if !exists $self->{req_w};
259
260 $_->set_visible for $self->children;
271} 261}
272 262
273sub set_invisible { 263sub set_invisible {
274 my ($self) = @_; 264 my ($self) = @_;
275 265
276 return unless $self->{visible}; 266 return unless $self->{visible};
277 267
278 # broken show/hide model 268 $_->set_invisible for $self->children;
279 269
280 delete $self->{root}; 270 delete $self->{root};
281 delete $self->{visible}; 271 delete $self->{visible};
282 272
283 undef $GRAB if $GRAB == $self; 273 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 274 undef $HOVER if $HOVER == $self;
285 275
286 CFClient::UI::check_tooltip 276 CFClient::UI::check_tooltip
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 277 if $TOOLTIP->{owner} == $self;
288 278
289 $self->focus_out; 279 $self->focus_out;
290 280
291 $self->emit (visibility_change => 0); 281 $self->emit (visibility_change => 0);
282}
283
284sub set_visibility {
285 my ($self, $visible) = @_;
286
287 return if $self->{visible} == $visible;
288
289 $visible ? $self->hide
290 : $self->show;
291}
292
293sub toggle_visibility {
294 my ($self) = @_;
295
296 $self->{visible}
297 ? $self->hide
298 : $self->show;
292} 299}
293 300
294sub hide { 301sub hide {
295 my ($self) = @_; 302 my ($self) = @_;
296 303
… …
298 305
299 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
300 if $self->{parent}; 307 if $self->{parent};
301} 308}
302 309
303sub move { 310sub move_abs {
304 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
305 312
306 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
307 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
308 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
309 316
310 $self->update; 317 $self->update;
311} 318}
312 319
313sub set_size { 320sub set_size {
314 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
315 322
316 $self->{def_w} = $w; 323 $self->{force_w} = $w;
317 $self->{def_h} = $h; 324 $self->{force_h} = $h;
318 325
319 $self->check_size; 326 $self->realloc;
320} 327}
321 328
322sub size_request { 329sub size_request {
323 require Carp; 330 require Carp;
324 Carp::confess "size_request is abstract"; 331 Carp::confess "size_request is abstract";
… …
326 333
327sub configure { 334sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
329 336
330 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
333 342
334 # use alignment to adjust x, y 343 # use alignment to adjust x, y
335 344
336 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 347 }
341 348
342 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 350 $self->{x} = $x;
344 $self->{y} = $y; 351 $self->{y} = $y;
345 $self->update; 352 $self->update;
346 } 353 }
347 354
348 if ($self->{w} != $w || $self->{h} != $h) { 355 if ($self->{w} != $w || $self->{h} != $h) {
356 return unless $self->{visible};
357
349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
350 } 359 }
351} 360}
352 361
353sub size_allocate { 362sub size_allocate {
354 # nothing to be done 363 # nothing to be done
355}
356
357sub reconfigure {
358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362} 364}
363 365
364sub children { 366sub children {
365} 367}
366 368
… …
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
451
452sub find_widget {
453 my ($self, $x, $y) = @_;
454
455 return () unless $self->{can_events};
456
457 return $self
458 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
459 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
460
461 ()
462}
463
464sub set_parent {
465 my ($self, $parent) = @_;
466
467 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible};
470}
471
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc {
496 my ($self) = @_;
497
498 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self};
500
501 $self->{root}{realloc}{$self} = $self;
502 $self->{root}->update;
503 } else {
504 delete $self->{req_w};
505 }
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
520}
449 521
450sub draw { 522sub draw {
451 my ($self) = @_; 523 my ($self) = @_;
452 524
453 return unless $self->{h} && $self->{w}; 525 return unless $self->{h} && $self->{w};
… …
470 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
471 glEnd; 543 glEnd;
472 glDisable GL_BLEND; 544 glDisable GL_BLEND;
473 } 545 }
474 546
475 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
476 glPushMatrix; 548 glPushMatrix;
477 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
479 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
491 my ($self) = @_; 563 my ($self) = @_;
492 564
493 warn "no draw defined for $self\n"; 565 warn "no draw defined for $self\n";
494} 566}
495 567
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553}
554
555sub DESTROY { 568sub DESTROY {
556 my ($self) = @_; 569 my ($self) = @_;
557 570
558 delete $WIDGET{$self+0}; 571 delete $WIDGET{$self+0};
559 #$self->deactivate; 572 #$self->deactivate;
… …
615 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
617} 630}
618 631
619sub size_request { 632sub size_request {
620 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
621} 636}
622 637
623sub draw { } 638sub draw { }
624 639
625############################################################################# 640#############################################################################
… …
654 $self->{children} = [ 669 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 670 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 671 @{$self->{children}}, @widgets
657 ]; 672 ];
658 673
659 $self->check_size (1); 674 $self->realloc;
660 $self->update;
661} 675}
662 676
663sub children { 677sub children {
664 @{ $_[0]{children} } 678 @{ $_[0]{children} }
665} 679}
… …
670 delete $child->{parent}; 684 delete $child->{parent};
671 $child->hide; 685 $child->hide;
672 686
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 687 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 688
675 $self->check_size (1); 689 $self->realloc;
676 $self->update;
677} 690}
678 691
679sub clear { 692sub clear {
680 my ($self) = @_; 693 my ($self) = @_;
681 694
… …
685 for (@$children) { 698 for (@$children) {
686 delete $_->{parent}; 699 delete $_->{parent};
687 $_->hide; 700 $_->hide;
688 } 701 }
689 702
690 $self->check_size; 703 $self->realloc;
691 $self->update;
692} 704}
693 705
694sub find_widget { 706sub find_widget {
695 my ($self, $x, $y) = @_; 707 my ($self, $x, $y) = @_;
696 708
… …
749sub size_request { 761sub size_request {
750 $_[0]{children}[0]->size_request 762 $_[0]{children}[0]->size_request
751} 763}
752 764
753sub size_allocate { 765sub size_allocate {
754 my ($self, $w, $h) = @_; 766 my ($self, $w, $h, $changed) = @_;
755 767
756 $self->{children}[0]->configure (0, 0, $w, $h); 768 $self->{children}[0]->configure (0, 0, $w, $h);
757} 769}
758 770
759############################################################################# 771#############################################################################
… …
776 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 788 $ROOT->on_post_alloc ($self => sub { $self->render_child });
777 $self->SUPER::update; 789 $self->SUPER::update;
778} 790}
779 791
780sub size_allocate { 792sub size_allocate {
781 my ($self, $w, $h) = @_; 793 my ($self, $w, $h, $changed) = @_;
782 794
783 $self->SUPER::size_allocate ($w, $h); 795 $self->SUPER::size_allocate ($w, $h, $changed);
784 $self->update; 796 $self->update
797 if $changed;
785} 798}
786 799
787sub _render { 800sub _render {
788 $_[0]{children}[0]->draw; 801 $_[0]{children}[0]->draw;
789} 802}
… …
842 855
843 ($w, $h) 856 ($w, $h)
844} 857}
845 858
846sub size_allocate { 859sub size_allocate {
847 my ($self, $w, $h) = @_; 860 my ($self, $w, $h, $changed) = @_;
848 861
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
851 864
852 $self->child->configure (0, 0, $w, $h); 865 $self->child->configure (0, 0, $w, $h);
… …
939 my $child = $self->{vp}->child; 952 my $child = $self->{vp}->child;
940 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
941} 954}
942 955
943sub size_allocate { 956sub size_allocate {
944 my ($self, $w, $h) = @_; 957 my ($self, $w, $h, $changed) = @_;
945 958
946 $self->SUPER::size_allocate ($w, $h); 959 $self->SUPER::size_allocate ($w, $h, $changed);
947 960
948 my $child = $self->{vp}->child; 961 my $child = $self->{vp}->child;
949 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
950} 963}
951 964
… …
998 1011
999our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
1000 1013
1001use CFClient::OpenGL; 1014use CFClient::OpenGL;
1002 1015
1003my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1006 1023
1007sub new { 1024sub new {
1008 my $class = shift; 1025 my $class = shift;
1009 1026
1010 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1030 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1031 can_events => 1,
1016 @_ 1032 @_
1017 ); 1033 );
1018 1034
1019 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
… …
1039 $h + $self->border * 2, 1055 $h + $self->border * 2,
1040 ) 1056 )
1041} 1057}
1042 1058
1043sub size_allocate { 1059sub size_allocate {
1044 my ($self, $w, $h) = @_; 1060 my ($self, $w, $h, $changed) = @_;
1061
1062 return unless $changed;
1045 1063
1046 $h -= List::Util::max 0, $self->border * 2; 1064 $h -= List::Util::max 0, $self->border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1065 $w -= List::Util::max 0, $self->border * 2;
1048 1066
1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1073 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
1074 1092
1075 my $dx = $ev->{x} - $ox; 1093 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1094 my $dy = $ev->{y} - $oy;
1077 1095
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1098
1083 $self->check_size; 1099 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1084 }; 1101 };
1085 1102
1086 } elsif ($lr ^ $td) { 1103 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1107 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
1092 1109
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1111
1095 $self->{user_x} = $bx + $x - $ox; 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy;
1097
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1113 };
1101 } 1114 }
1102} 1115}
1103 1116
1104sub button_up { 1117sub button_up {
… …
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1137
1125 my $border = $self->border; 1138 my $border = $self->border;
1126 1139
1127 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1145
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1147 glColor @{ $self->{bg} };
1135 1148
1136 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
1150 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1151 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1152 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1154 }
1147 1155
1148 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
1149 1157
… …
1179 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
1180 1188
1181 $child->set_parent ($self); 1189 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
1183 1191
1184 $self->check_size (1); 1192 $self->realloc;
1185} 1193}
1186 1194
1187# TODO: move to container class maybe? send children a signal on removal? 1195# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1196sub clear {
1189 my ($self) = @_; 1197 my ($self) = @_;
… …
1194 for (@children) { 1202 for (@children) {
1195 delete $_->{parent}; 1203 delete $_->{parent};
1196 $_->hide; 1204 $_->hide;
1197 } 1205 }
1198 1206
1199 $self->check_size (1); 1207 $self->realloc;
1200 $self->update;
1201} 1208}
1202 1209
1203sub get_wh { 1210sub get_wh {
1204 my ($self) = @_; 1211 my ($self) = @_;
1205 1212
… …
1232 (sum @$hs), 1239 (sum @$hs),
1233 ) 1240 )
1234} 1241}
1235 1242
1236sub size_allocate { 1243sub size_allocate {
1237 my ($self, $w, $h) = @_; 1244 my ($self, $w, $h, $changed) = @_;
1238 1245
1239 my ($ws, $hs) = $self->get_wh; 1246 my ($ws, $hs) = $self->get_wh;
1240 1247
1241 my $req_w = (sum @$ws) || 1; 1248 my $req_w = (sum @$ws) || 1;
1242 my $req_h = (sum @$hs) || 1; 1249 my $req_h = (sum @$hs) || 1;
… …
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1327 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 ) 1328 )
1322} 1329}
1323 1330
1324sub size_allocate { 1331sub size_allocate {
1325 my ($self, $w, $h) = @_; 1332 my ($self, $w, $h, $changed) = @_;
1326 1333
1327 my $space = $self->{vertical} ? $h : $w; 1334 my $space = $self->{vertical} ? $h : $w;
1328 my $children = $self->{children}; 1335 my $children = $self->{children};
1329 1336
1330 my @req; 1337 my @req;
… …
1459 $self->{text} = "T$text"; 1466 $self->{text} = "T$text";
1460 1467
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1469 $self->{layout}->set_text ($text);
1463 1470
1471 $self->realloc;
1464 $self->update; 1472 $self->update;
1465 $self->check_size;
1466} 1473}
1467 1474
1468sub set_markup { 1475sub set_markup {
1469 my ($self, $markup) = @_; 1476 my ($self, $markup) = @_;
1470 1477
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1481 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1482
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1484 $self->{layout}->set_markup ($markup);
1478 1485
1486 $self->realloc;
1479 $self->update; 1487 $self->update;
1480 $self->check_size;
1481} 1488}
1482 1489
1483sub size_request { 1490sub size_request {
1484 my ($self) = @_; 1491 my ($self) = @_;
1485 1492
… …
1506 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1507 ) 1514 )
1508} 1515}
1509 1516
1510sub size_allocate { 1517sub size_allocate {
1511 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1512 1519
1513 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1514} 1522}
1515 1523
1516sub set_fontsize { 1524sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1518 1526
1519 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1528 delete $self->{texture};
1521 1529
1522 $self->update; 1530 $self->realloc;
1523 $self->check_size;
1524} 1531}
1525 1532
1526sub _draw { 1533sub _draw {
1527 my ($self) = @_; 1534 my ($self) = @_;
1528 1535
… …
1608sub set_text { 1615sub set_text {
1609 my ($self, $text) = @_; 1616 my ($self, $text) = @_;
1610 1617
1611 $self->{cursor} = length $text; 1618 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1619 $self->_set_text ($text);
1613 $self->update; 1620
1614 $self->check_size; 1621 $self->realloc;
1615} 1622}
1616 1623
1617sub get_text { 1624sub get_text {
1618 $_[0]{text} 1625 $_[0]{text}
1619} 1626}
… …
1652 } elsif ($uni) { 1659 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1654 } 1661 }
1655 1662
1656 $self->_set_text ($text); 1663 $self->_set_text ($text);
1657 $self->update; 1664
1658 $self->check_size; 1665 $self->realloc;
1659} 1666}
1660 1667
1661sub focus_in { 1668sub focus_in {
1662 my ($self) = @_; 1669 my ($self) = @_;
1663 1670
… …
2156 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2164 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2165 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2166 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2167 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2168 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2169 min_h => $::WIDTH / 80,
2163 vertical => 0, 2170 vertical => 0,
2164 can_hover => 1, 2171 can_hover => 1,
2165 inner_pad => 0.02, 2172 inner_pad => 0.02,
2166 @_ 2173 @_
2167 ); 2174 );
… …
2170 $self->update; 2177 $self->update;
2171 2178
2172 $self 2179 $self
2173} 2180}
2174 2181
2182sub changed { }
2183
2175sub set_range { 2184sub set_range {
2176 my ($self, $range) = @_; 2185 my ($self, $range) = @_;
2177 2186
2178 ($range, $self->{range}) = ($self->{range}, $range); 2187 ($range, $self->{range}) = ($self->{range}, $range);
2179 2188
… …
2205} 2214}
2206 2215
2207sub size_request { 2216sub size_request {
2208 my ($self) = @_; 2217 my ($self) = @_;
2209 2218
2210 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2220}
2215 2221
2216sub button_down { 2222sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
2218 2224
… …
2368 $self->{fontsize} = $fontsize; 2374 $self->{fontsize} = $fontsize;
2369 $self->reflow; 2375 $self->reflow;
2370} 2376}
2371 2377
2372sub size_allocate { 2378sub size_allocate {
2373 my ($self, $w, $h) = @_; 2379 my ($self, $w, $h, $changed) = @_;
2374 2380
2375 $self->SUPER::size_allocate ($w, $h); 2381 $self->SUPER::size_allocate ($w, $h, $changed);
2382
2383 return unless $changed;
2376 2384
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2385 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2380 2388
… …
2622 2630
2623 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2624} 2632}
2625 2633
2626sub size_allocate { 2634sub size_allocate {
2627 my ($self, $w, $h) = @_; 2635 my ($self, $w, $h, $changed) = @_;
2628 2636
2637 return unless $changed;
2638
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2640}
2641
2642sub visibility_change {
2643 my ($self, $visible) = @_;
2644
2645 return unless $visible;
2646
2647 $self->{root}->on_post_alloc ("move_$self" => sub {
2648 my $widget = $self->{owner}
2649 or return;
2650
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH;
2655
2656 $self->move_abs ($x, $y);
2657 });
2630} 2658}
2631 2659
2632sub _draw { 2660sub _draw {
2633 my ($self) = @_; 2661 my ($self) = @_;
2634 2662
… …
2651 glVertex $w, $h; 2679 glVertex $w, $h;
2652 glVertex $w, 0; 2680 glVertex $w, 0;
2653 glEnd; 2681 glEnd;
2654 2682
2655 glTranslate 2 - 0.375, 2 - 0.375; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2684
2656 $self->SUPER::_draw; 2685 $self->SUPER::_draw;
2657} 2686}
2658 2687
2659############################################################################# 2688#############################################################################
2660 2689
… …
2969use CFClient::OpenGL; 2998use CFClient::OpenGL;
2970 2999
2971sub new { 3000sub new {
2972 my $class = shift; 3001 my $class = shift;
2973 3002
2974 $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
2975 visible => 1, 3004 visible => 1,
2976 @_, 3005 @_,
2977 ) 3006 );
3007
3008 Scalar::Util::weaken ($self->{root} = $self);
3009
3010 $self
2978} 3011}
2979 3012
2980sub configure { 3013sub configure {
2981 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2982 3015
2983 $self->{w} = $w; 3016 $self->{w} = $w;
2984 $self->{h} = $h; 3017 $self->{h} = $h;
2985} 3018}
2986 3019
2987sub check_size { 3020sub reconfigure {
2988 my ($self) = @_; 3021 my ($self) = @_;
2989 3022
3023 $self->SUPER::reconfigure;
3024
2990 $self->size_allocate ($self->{w}, $self->{h}) 3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
2991 if $self->{w}; 3026 if $self->{w};
2992} 3027}
2993 3028
2994sub size_request { 3029sub size_request {
2995 my ($self) = @_; 3030 my ($self) = @_;
2996 3031
2997 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
2998} 3033}
2999 3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
3047}
3048
3000sub size_allocate { 3049sub size_allocate {
3001 my ($self, $w, $h) = @_; 3050 my ($self, $w, $h, $changed) = @_;
3002 3051
3003 for my $child ($self->children) { 3052 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3054
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
3008 3057
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3060
3017 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
3018 } 3062 }
3019} 3063}
3020 3064
… …
3031} 3075}
3032 3076
3033sub update { 3077sub update {
3034 my ($self) = @_; 3078 my ($self) = @_;
3035 3079
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3080 $::WANT_REFRESH++;
3038} 3081}
3039 3082
3040sub add { 3083sub add {
3041 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
3042 3085
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3086 $_->{is_toplevel} = 1
3045 3087 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3088
3051 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3090}
3059 3091
3060sub remove { 3092sub remove {
3061 my ($self, @children) = @_; 3093 my ($self, @children) = @_;
3062 3094
3063 $self->SUPER::remove (@children); 3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3064 3099
3065 while (@children) { 3100 while (@children) {
3066 my $w = pop @children; 3101 my $w = pop @children;
3067 push @children, $w->children; 3102 push @children, $w->children;
3068 $w->set_invisible; 3103 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3122 while ($self->{refresh_hook}) {
3088 $_->() 3123 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3124 for values %{delete $self->{refresh_hook}};
3090 } 3125 }
3091 3126
3092 if ($self->{check_size}) { 3127 if ($self->{realloc}) {
3093 my @queue; 3128 my @queue;
3094 3129
3095 for (;;) { 3130 while () {
3096 if ($self->{check_size}) { 3131 if ($self->{realloc}) {
3097 #TODO use array-of-depth approach 3132 #TODO use array-of-depth approach
3098 3133
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3134 @queue = sort { $a->{visible} <=> $b->{visible} }
3100 @queue, values %{delete $self->{check_size}}; 3135 @queue, values %{delete $self->{realloc}};
3101 } 3136 }
3102 3137
3103 my $widget = pop @queue || last; 3138 my $widget = pop @queue || last;
3104 3139
3105 defined $widget->{visible} or last; # do not resize invisible widgets 3140 $widget->{visible} or last; # do not resize invisible widgets
3106 3141
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request; 3142 my ($w, $h) = $widget->size_request;
3110 3143
3111 if (delete $widget->{force_alloc} 3144 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3145
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
3114 3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
3115 $widget->{req_w} = $w; 3152 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3153 $widget->{req_h} = $h;
3117 3154
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3155 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3119 3156
3120 $widget->{parent}->check_size 3157 push @queue, $widget->{parent}
3121 if $widget->{parent}; 3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3122 }
3123 } 3159 }
3124 } 3160 }
3125 3161
3126 while ($self->{size_alloc}) { 3162 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3128 my ($widget, $w, $h) = @$_; 3164 values %$size_alloc;
3165
3166 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last };
3168
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3129 3171
3130 $w = 0 if $w < 0; 3172 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3173 $h = 0 if $h < 0;
3132 3174
3175 $w = int $w + 0.5;
3176 $h = int $h + 0.5;
3177
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3179
3133 $widget->{w} = $w; 3180 $widget->{w} = $w;
3134 $widget->{h} = $h; 3181 $widget->{h} = $h;
3182
3135 $widget->emit (size_allocate => $w, $h); 3183 $widget->emit (size_allocate => $w, $h, $changed);
3136 } 3184 }
3137 } 3185 }
3138 3186
3139 while ($self->{post_alloc_hook}) { 3187 while ($self->{post_alloc_hook}) {
3140 $_->() 3188 $_->()

Diff Legend

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