--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/22 12:14:45	1.148
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/22 23:11:32	1.149
@@ -296,14 +296,15 @@
 sub check_size {
    my ($self) = @_;
 
+   return unless $self->{parent};
+
    my ($w, $h) = $self->size_request;
 
    if ($w != $self->{req_w}  || $h != $self->{req_h}) {
       $self->{req_w} = $w;
       $self->{req_h} = $h;
 
-      $self->{parent}->check_size
-         if $self->{parent};
+      $self->{parent}->check_size;
    }
 }
 
@@ -563,7 +564,7 @@
 sub size_request {
    my ($self) = @_;
 
-   @$self{qw(child_w child_h)} = $self->child->size_request;
+   @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
    $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
 
    @$self{qw(child_w child_h)}
@@ -839,7 +840,7 @@
       for my $x (0 .. $#$row) {
          my $widget = $row->[$x]
             or next;
-         my ($w, $h) = $widget->size_request;
+         my ($w, $h) = @$widget{qw(req_w req_h)};
 
          $w[$x] = max $w[$x], $w;
          $h[$y] = max $h[$y], $h;
@@ -954,7 +955,7 @@
 
    my $children = $self->{children};
 
-   my @h = map +($_->size_request)[0], @$children;
+   my @h = map $_->{req_w}, @$children;
 
    my $req_h = List::Util::sum @h;
 
@@ -1012,7 +1013,7 @@
 
    my $children = $self->{children};
 
-   my @h = map +($_->size_request)[1], @$children;
+   my @h = map $_->{req_h}, @$children;
 
    my $req_h = List::Util::sum @h;
 
@@ -1094,6 +1095,7 @@
    $self->{layout}->set_text ($text);
 
    delete $self->{texture};
+   $self->check_size;
    $self->update;
 }
 
@@ -1103,6 +1105,7 @@
    $self->{layout}->set_markup ($markup);
 
    delete $self->{texture};
+   $self->check_size;
    $self->update;
 }
 
@@ -1232,7 +1235,7 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->_set_text ($self->{text});
+   $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
 }
 
 sub set_text {
@@ -2094,7 +2097,7 @@
 sub check_size {
    my ($self) = @_;
 
-   $self->configure (0, 0, $::WITH, $::HEIGHT);
+   $self->configure (0, 0, $::WIDTH, $::HEIGHT);
 }
 
 sub size_request {
@@ -2106,8 +2109,13 @@
 
    $self->SUPER::configure ($x, $y, $w, $h);
 
-   $_->configure ($_->{x}, $_->{y}, $_->size_request)
-      for @{$self->{children}};
+   for my $child (@{$self->{children}}) {
+      my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
+
+      $X = List::Util::max 0, List::Util::min $w - $W, $X;
+      $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
+      $child->configure ($X, $Y, $W,$H);
+   }
 }
 
 sub _topleft {