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.404 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.408 by root, Sun Jul 22 15:26:01 2007 UTC

… …
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030 }; 2030 };
2031 2031
2032 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
2033 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
2034 2040
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
2037 2051
2038############################################################################# 2052#############################################################################
2039 2053
2040package CFPlus::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
2041 2055
… …
3439 3453
3440 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
3441 CFPlus::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
3442 3456
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
3446 parked => 1, 3460 parked => 1,
3447 cb => sub { 3461 cb => sub {
3448 return unless $::CONN && $widget; 3462 return unless $::CONN && $widget;
3449 3463
… …
3751sub add { 3765sub add {
3752 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3753 3767
3754 CFPlus::weaken $self; 3768 CFPlus::weaken $self;
3755 3769
3756 $self->{buttonbar}->add (new CFPlus::UI::Button 3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3757 markup => $title, 3772 markup => $title,
3758 tooltip => $tooltip, 3773 tooltip => $tooltip,
3774 );
3775 }
3776
3759 on_activate => sub { $self->set_current_page ($widget) }, 3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3760 ); 3778 $self->{buttonbar}->add ($title);
3761 3779
3762 $self->{multiplexer}->add ($widget); 3780 $self->{multiplexer}->add ($widget);
3763} 3781}
3764 3782
3765sub get_current_page { 3783sub get_current_page {

Diff Legend

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