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.82 by root, Wed Apr 12 02:00:06 2006 UTC vs.
Revision 1.84 by root, Wed Apr 12 12:20:00 2006 UTC

741 741
742 my $x = 0; 742 my $x = 0;
743 my $row_h = $hs->[$r]; 743 my $row_h = $hs->[$r];
744 744
745 for my $c (0 .. $#$row) { 745 for my $c (0 .. $#$row) {
746 my $widget = $row->[$c]
747 or next;
748
749 my $col_w = $ws->[$c]; 746 my $col_w = $ws->[$c];
750 747
748 if (my $widget = $row->[$c]) {
751 $widget->size_allocate ($x, $y, $col_w, $row_h); 749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
752 751
753 $x += $col_w; 752 $x += $col_w;
754 } 753 }
755 754
756 $y += $row_h; 755 $y += $row_h;
998 my $x = 997 my $x =
999 $self->{align} < 0 ? $self->{padding} 998 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 999 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5; 1000 : ($self->{w} - $tex->{w}) * 0.5;
1002 1001
1003 glTranslate $x, $self->{padding}, 0; 1002 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
1004 $tex->draw_quad (0, 0); 1003 $tex->draw_quad (0, 0);
1005 1004
1006 glDisable GL_TEXTURE_2D; 1005 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND; 1006 glDisable GL_BLEND;
1008} 1007}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines