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.421 by root, Wed Aug 1 14:27:21 2007 UTC vs.
Revision 1.426 by root, Sat Aug 11 12:07:54 2007 UTC

… …
1923 1923
1924 delete $self->{ox}; 1924 delete $self->{ox};
1925 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1926} 1926}
1927 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1928sub set_text { 1934sub set_text {
1929 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1930 1936
1931 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1932 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2038 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2039 2045
2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2043 }; 2051 };
2044 2052
2045# unless ($self->{list}) { 2053# unless ($self->{list}) {
2046# $self->{list} = CFPlus::OpenGL::glGenList; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list}; 2055# CFPlus::OpenGL::glNewList $self->{list};
… …
2049# CFPlus::OpenGL::glEndList; 2057# CFPlus::OpenGL::glEndList;
2050# } 2058# }
2051# 2059#
2052# CFPlus::OpenGL::glCallList $self->{list}; 2060# CFPlus::OpenGL::glCallList $self->{list};
2053 2061
2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2062 $self->{layout}->draw;
2055} 2063}
2056 2064
2057#sub destroy { 2065#sub destroy {
2058# my ($self) = @_; 2066# my ($self) = @_;
2059# 2067#
… …
3298 3306
3299 if ($y0 < $y + $h && $y < $y1) { 3307 if ($y0 < $y + $h && $y < $y1) {
3300 my $layout = $self->get_layout ($para); 3308 my $layout = $self->get_layout ($para);
3301 3309
3302 $layout->render ($para->{indent}, $y - $y0); 3310 $layout->render ($para->{indent}, $y - $y0);
3311 $layout->draw;
3303 3312
3304 if (my @w = @{ $para->{widget} }) { 3313 if (my @w = @{ $para->{widget} }) {
3305 my @s = $layout->get_shapes; 3314 my @s = $layout->get_shapes;
3306 3315
3307 for (@w) { 3316 for (@w) {
… …
3583 3592
3584 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3593 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585 if ($anim && @$anim) { 3594 if ($anim && @$anim) {
3586 delete $self->{wait_face}; 3595 delete $self->{wait_face};
3587 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3596 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3588 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3597 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3598 unless ($tex->{name} || $tex->{loading}) {
3599 $tex->upload (sub { $self->reconfigure });
3600 }
3601 }
3589 } 3602 }
3590 } 3603 }
3591} 3604}
3592 3605
3593sub size_request { 3606sub size_request {
3594 my ($self) = @_; 3607 my ($self) = @_;
3595 3608
3596 if ($::CONN) { 3609 if ($::CONN) {
3597 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3610 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3598 if (my $tex = $::CONN->{texture}[$faceid]) { 3611 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3599 $self->{tex} = $tex; 3612 if ($tex->{name}) {
3600 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3613 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3614 } elsif (!$tex->{loading}) {
3615 $tex->upload (sub { $self->reconfigure });
3616 }
3601 } else { 3617 } else {
3602 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3618 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3603 $self->realloc; 3619 $self->reconfigure;
3604 }); 3620 });
3605 } 3621 }
3606 } 3622 }
3607 } 3623 }
3608 3624
… …
4193} 4209}
4194 4210
4195sub update { 4211sub update {
4196 my ($self) = @_; 4212 my ($self) = @_;
4197 4213
4198 $::WANT_REFRESH++; 4214 $::WANT_REFRESH->start;
4199} 4215}
4200 4216
4201sub add { 4217sub add {
4202 my ($self, @children) = @_; 4218 my ($self, @children) = @_;
4203 4219

Diff Legend

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