--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 22:08:24	1.25
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 22:23:57	1.26
@@ -125,7 +125,7 @@
 sub add {
    my ($self, $chld) = @_;
    $self->SUPER::add ($chld);
-   $self->render_chld;
+   $self->render_chld; #TODO: Move this to the size_request event propably?
 }
 
 sub render_chld {
@@ -190,6 +190,8 @@
 
    my $chld = $self->get;
 
+   $chld->move (2, 2, 0); #TODO:move to size_request
+
    my ($w, $h) = $chld->size_request;
 
    glColor 1, 0, 0;
@@ -200,10 +202,7 @@
    glTexCoord 1, 0; glVertex $w + 4 , 0;
    glEnd;
 
-   glPushMatrix;
-   glTranslate (2, 2, 0);
    $chld->draw;
-   glPopMatrix;
 }
 
 package Crossfire::Client::Widget::Table;
@@ -274,11 +273,11 @@
 
       for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
 
-         glPushMatrix;
-         glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved
          my $c = $self->{childs}->[$yi]->[$xi];
-         $c->draw if $c;
-         glPopMatrix;
+         if ($c) {
+            $c->move ($x, $y, 0); #TODO: Move to size_request
+            $c->draw if $c;
+         }
 
          $x += $self->max_col_width ($xi);
       }
@@ -316,10 +315,8 @@
 
    my ($x, $y);
    for (@{$self->{childs} || []}) {
-      glPushMatrix;
-      glTranslate (0, $y, 0);# see above TODO
+      $_->move (0, $y, 0); #TODO: move to size_request
       $_->draw;
-      glPopMatrix;
       my ($w, $h) = $_->size_request;
       $y += $h;
    }
@@ -367,10 +364,10 @@
 
    glEnable GL_BLEND;
    glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
    glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glColor 1, 1, 1;
+   glColor 1, 0, 1;
 
    glBegin GL_QUADS;
    glTexCoord 0, 0; glVertex 0            , 0;