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.375 by root, Mon Jul 16 20:12:19 2007 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 2007 UTC

986} 986}
987 987
988sub set_offset { 988sub 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 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);
994 $self->update; 999 $self->update;
1000 }
995} 1001}
996 1002
997# 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
998sub coord2local { 1004sub coord2local {
999 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1074 row_expand => [1, 0], 1080 row_expand => [1, 0],
1075 %arg, 1081 %arg,
1076 ); 1082 );
1077 1083
1078 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1, 1085 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1086 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1082 ; 1096 ;
1083 1097
1084 $self->SUPER::add (0, 0, $self->{vp}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1085 1099
1086 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1140sub invoke_button_down { 1154sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1142 1156
1143 if ($ev->{button} == 2) { 1157 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1145 1162
1146 $self->{motion} = sub { 1163 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_; 1164 my ($ev, $x, $y) = @_;
1148 1165
1149 $self->{vp}->set_offset ( 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1150 $self->{vp}{view_x} - $ev->{xrel}, 1167 $self->update;
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 }; 1168 };
1154 1169
1155 return 1; 1170 return 1;
1156 } 1171 }
1157 1172
3478 ); 3493 );
3479 3494
3480 if ($self->{anim} && $self->{animspeed}) { 3495 if ($self->{anim} && $self->{animspeed}) {
3481 CFPlus::weaken (my $widget = $self); 3496 CFPlus::weaken (my $widget = $self);
3482 3497
3498 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3499 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3483 $self->{timer} = Event->timer ( 3500 $self->{timer} = Event->timer (
3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3485 hard => 1, 3501 parked => 1,
3486 interval => $self->{animspeed},
3487 cb => sub { 3502 cb => sub {
3488 return unless $::CONN; 3503 return unless $::CONN && $widget;
3489 3504
3490 ++$widget->{frame}; 3505 ++$widget->{frame};
3491 $self->update_face; 3506 $widget->update_face;
3492 $self->update; 3507 $widget->update;
3508
3509 $widget->update_timer;
3493 }, 3510 },
3494 ); 3511 );
3495 3512
3496 $self->update_face; 3513 $self->update_face;
3514 $self->update_timer;
3497 } 3515 }
3498 3516
3499 $self 3517 $self
3518}
3519
3520sub update_timer {
3521 my ($self) = @_;
3522
3523 return unless $self->{timer};
3524
3525 if ($self->{visible}) {
3526 $self->{timer}->at (
3527 $self->{anim_start}
3528 + $self->{animspeed}
3529 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3530 );
3531 $self->{timer}->start;
3532 } else {
3533 $self->{timer}->stop;
3534 }
3500} 3535}
3501 3536
3502sub update_face { 3537sub update_face {
3503 my ($self) = @_; 3538 my ($self) = @_;
3504 3539
3536 return unless $self->{visible}; 3571 return unless $self->{visible};
3537 3572
3538 $self->SUPER::update; 3573 $self->SUPER::update;
3539} 3574}
3540 3575
3576sub invoke_visibility_change {
3577 my ($self) = @_;
3578
3579 $self->update_timer;
3580
3581 0
3582}
3583
3541sub _draw { 3584sub _draw {
3542 my ($self) = @_; 3585 my ($self) = @_;
3543 3586
3544 return unless $::CONN; 3587 return unless $::CONN;
3545 3588
3560} 3603}
3561 3604
3562sub destroy { 3605sub destroy {
3563 my ($self) = @_; 3606 my ($self) = @_;
3564 3607
3565 $self->{timer}->cancel 3608 (delete $self->{timer})->cancel
3566 if $self->{timer}; 3609 if $self->{timer};
3567 3610
3568 $self->SUPER::destroy; 3611 $self->SUPER::destroy;
3569} 3612}
3570 3613

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines