--- deliantra/Deliantra-Client/DC/UI.pm	2007/07/22 16:37:19	1.410
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/07/22 19:34:59	1.411
@@ -1688,19 +1688,10 @@
 
 our @ISA = CFPlus::UI::Container::;
 
-sub add_fixed {
-   my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
-
-   $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
-   $self->SUPER::add ($child);
-}
-
 sub _scale($$$) {
-   my ($mode, $val, $max) = @_;
+   my ($rel, $val, $max) = @_;
 
-   $mode eq "abs"   ? $val
-   : $mode eq "rel" ? $val * $max
-   :                  0
+   $rel ? $val * $max : $val
 }
 
 sub size_request {
@@ -1710,14 +1701,12 @@
 
    # determine overall size by querying abs widgets
    for my $child ($self->visible_children) {
-      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+      unless ($child->{c_rel}) {
+         my $x = $child->{c_x};
+         my $y = $child->{c_y};
 
-      if ($pos eq "abs") {
-         $w = _scale $size, $w, $child->{req_w};
-         $h = _scale $size, $h, $child->{req_h};
-
-         $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
-         $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+         $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
+         $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
       }
    }
 
@@ -1726,16 +1715,12 @@
 
    # now layout remaining widgets
    for my $child ($self->visible_children) {
-      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
-
-      if ($pos ne "abs") {
-         $x = _scale $pos,  $x, $W;
-         $y = _scale $pos,  $x, $H;
-         $w = _scale $size, $w, $child->{req_w};
-         $h = _scale $size, $h, $child->{req_h};
+      if ($child->{c_rel}) {
+         my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
+         my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
 
-         $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
-         $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+         $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
+         $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
       }
    }
 
@@ -1749,14 +1734,13 @@
    my ($self, $W, $H) = @_;
 
    for my $child ($self->visible_children) {
-      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+      my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
+      my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
 
-      $x = _scale $pos,  $x, $W;
-      $y = _scale $pos,  $x, $H;
-      $w = _scale $size, $w, $W;
-      $h = _scale $size, $h, $H;
+      $x += $child->{c_halign} * $child->{req_w};
+      $y += $child->{c_valign} * $child->{req_h};
 
-      $child->configure ($x, $y, $w, $h);
+      $child->configure ($x, $y, $child->{req_w}, $child->{req_h});
    }
 
    1