--- deliantra/Deliantra-Client/DC/UI.pm	2010/10/12 05:11:38	1.481
+++ deliantra/Deliantra-Client/DC/UI.pm	2012/01/08 07:58:39	1.484
@@ -4,6 +4,7 @@
 
 use List::Util ();
 
+use AnyEvent ();
 use Guard ();
 
 use DC;
@@ -364,8 +365,8 @@
 sub set_size {
    my ($self, $w, $h) = @_;
 
-   $self->{force_w} = $w;
-   $self->{force_h} = $h;
+   $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
+   $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
 
    $self->realloc;
 }
@@ -1475,10 +1476,10 @@
    my ($w, $h) = @$self{qw(w h)};
    my $border = $self->border;
 
-   my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
-   my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
+   my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
+   my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
 
-   if ($lr & $td) {
+   if ($lr & $td) { # corners
       my ($wx, $wy) = ($self->{x}, $self->{y});
       my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bw, $bh) = ($self->{w}, $self->{h});
@@ -1492,14 +1493,16 @@
          my $dx = $ev->{x} - $ox;
          my $dy = $ev->{y} - $oy;
 
-         $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
-         $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
+         $self->set_size (
+            $bw + $dx * ($mx ? -1 : 1),
+            $bh + $dy * ($my ? -1 : 1),
+         );
 
          $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
          $self->realloc;
       };
 
-   } elsif ($lr ^ $td) {
+   } elsif ($lr ^ $td) { # edges
       my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bx, $by) = ($self->{x}, $self->{y});
 
@@ -3288,7 +3291,6 @@
       @_,
                  
       layout     => (new DC::Layout),
-      par        => [],
       max_par    => 0,
       height     => 0,
       children   => [
@@ -3299,6 +3301,8 @@
 
    $self->{children}[1]->connect (changed => sub { $self->update });
 
+   $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
+
    $self
 }
 
@@ -4294,7 +4298,7 @@
 
 sub reorder {
    my ($self) = @_;
-   my $NOW = EV::time;
+   my $NOW = AE::time;
 
    # freeze display when hovering over any label
    return if $DC::UI::TOOLTIP->{owner}
@@ -4403,6 +4407,16 @@
    });
 }
 
+sub clr_group {
+   my ($self, $group) = @_;
+
+   if (delete $self->{item}{$group}) {
+      $ROOT->on_refresh (reorder => sub {
+         $self->reorder;
+      });
+   }
+}
+
 sub reconfigure {
    my ($self) = @_;