| … | |
… | |
| 986 | } |
986 | } |
| 987 | |
987 | |
| 988 | sub set_offset { |
988 | sub set_offset { |
| 989 | my ($self, $x, $y) = @_; |
989 | my ($self, $x, $y) = @_; |
| 990 | |
990 | |
| 991 | $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; |
991 | my $x = max 0, min $self->child->{w} - $self->{w}, int $x; |
| 992 | $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; |
992 | my $y = max 0, min $self->child->{h} - $self->{h}, int $y; |
| 993 | |
993 | |
| 994 | $self->emit (changed => $self->{view_x}, $self->{view_y}); |
994 | if ($x != $self->{view_x} or $y != $self->{view_y}) { |
|
|
995 | $self->{view_x} = $x; |
|
|
996 | $self->{view_y} = $y; |
|
|
997 | |
|
|
998 | $self->emit (changed => $x, $y); |
| 995 | $self->update; |
999 | $self->update; |
|
|
1000 | } |
| 996 | } |
1001 | } |
| 997 | |
1002 | |
| 998 | # hmm, this does not work for topleft of $self... but we should not ask for that |
1003 | # hmm, this does not work for topleft of $self... but we should not ask for that |
| 999 | sub coord2local { |
1004 | sub coord2local { |
| 1000 | my ($self, $x, $y) = @_; |
1005 | my ($self, $x, $y) = @_; |
| … | |
… | |
| 1080 | expand => 1, |
1085 | expand => 1, |
| 1081 | scroll_x => $self->{scroll_x}, |
1086 | scroll_x => $self->{scroll_x}, |
| 1082 | scroll_y => $self->{scroll_y}, |
1087 | scroll_y => $self->{scroll_y}, |
| 1083 | on_changed => sub { |
1088 | on_changed => sub { |
| 1084 | my ($vp, $x, $y) = @_; |
1089 | my ($vp, $x, $y) = @_; |
|
|
1090 | |
| 1085 | $vp->{parent}{hslider}->set_value ($x); |
1091 | $vp->{parent}{hslider}->set_value ($x); |
| 1086 | $vp->{parent}{vslider}->set_value ($y); |
1092 | $vp->{parent}{vslider}->set_value ($y); |
| 1087 | |
1093 | |
| 1088 | 0 |
1094 | 0 |
| 1089 | }, |
1095 | }, |
| … | |
… | |
| 3487 | ); |
3493 | ); |
| 3488 | |
3494 | |
| 3489 | if ($self->{anim} && $self->{animspeed}) { |
3495 | if ($self->{anim} && $self->{animspeed}) { |
| 3490 | CFPlus::weaken (my $widget = $self); |
3496 | CFPlus::weaken (my $widget = $self); |
| 3491 | |
3497 | |
|
|
3498 | $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; |
|
|
3499 | $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; |
| 3492 | $self->{timer} = Event->timer ( |
3500 | $self->{timer} = Event->timer ( |
| 3493 | at => $self->{animspeed} * int $::NOW / $self->{animspeed}, |
|
|
| 3494 | hard => 1, |
3501 | parked => 1, |
| 3495 | interval => $self->{animspeed}, |
|
|
| 3496 | cb => sub { |
3502 | cb => sub { |
| 3497 | return unless $::CONN; |
3503 | return unless $::CONN; |
| 3498 | |
3504 | |
|
|
3505 | if (!$widget) {#d# |
|
|
3506 | warn "animation widget timer active but widgetd estroyed\n";#d# |
|
|
3507 | warn $_[0]->w->active;#d# |
|
|
3508 | }#d# |
|
|
3509 | |
| 3499 | ++$widget->{frame}; |
3510 | ++$widget->{frame}; |
| 3500 | $self->update_face; |
3511 | $widget->update_face; |
| 3501 | $self->update; |
3512 | $widget->update; |
|
|
3513 | |
|
|
3514 | $widget->update_timer; |
| 3502 | }, |
3515 | }, |
| 3503 | ); |
3516 | ); |
| 3504 | |
3517 | |
| 3505 | $self->update_face; |
3518 | $self->update_face; |
|
|
3519 | $self->update_timer; |
| 3506 | } |
3520 | } |
| 3507 | |
3521 | |
| 3508 | $self |
3522 | $self |
|
|
3523 | } |
|
|
3524 | |
|
|
3525 | sub update_timer { |
|
|
3526 | my ($self) = @_; |
|
|
3527 | |
|
|
3528 | return unless $self->{timer}; |
|
|
3529 | |
|
|
3530 | if ($self->{visible}) { |
|
|
3531 | $self->{timer}->at ( |
|
|
3532 | $self->{anim_start} |
|
|
3533 | + $self->{animspeed} |
|
|
3534 | * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed} |
|
|
3535 | ); |
|
|
3536 | $self->{timer}->start; |
|
|
3537 | } else { |
|
|
3538 | $self->{timer}->stop; |
|
|
3539 | } |
| 3509 | } |
3540 | } |
| 3510 | |
3541 | |
| 3511 | sub update_face { |
3542 | sub update_face { |
| 3512 | my ($self) = @_; |
3543 | my ($self) = @_; |
| 3513 | |
3544 | |
| … | |
… | |
| 3545 | return unless $self->{visible}; |
3576 | return unless $self->{visible}; |
| 3546 | |
3577 | |
| 3547 | $self->SUPER::update; |
3578 | $self->SUPER::update; |
| 3548 | } |
3579 | } |
| 3549 | |
3580 | |
|
|
3581 | sub invoke_visibility_change { |
|
|
3582 | my ($self) = @_; |
|
|
3583 | |
|
|
3584 | $self->update_timer; |
|
|
3585 | |
|
|
3586 | 0 |
|
|
3587 | } |
|
|
3588 | |
| 3550 | sub _draw { |
3589 | sub _draw { |
| 3551 | my ($self) = @_; |
3590 | my ($self) = @_; |
| 3552 | |
3591 | |
| 3553 | return unless $::CONN; |
3592 | return unless $::CONN; |
| 3554 | |
3593 | |
| … | |
… | |
| 3569 | } |
3608 | } |
| 3570 | |
3609 | |
| 3571 | sub destroy { |
3610 | sub destroy { |
| 3572 | my ($self) = @_; |
3611 | my ($self) = @_; |
| 3573 | |
3612 | |
| 3574 | $self->{timer}->cancel |
3613 | (delete $self->{timer})->cancel |
| 3575 | if $self->{timer}; |
3614 | if $self->{timer}; |
| 3576 | |
3615 | |
| 3577 | $self->SUPER::destroy; |
3616 | $self->SUPER::destroy; |
| 3578 | } |
3617 | } |
| 3579 | |
3618 | |
