--- deliantra/Deliantra-Client/DC/UI.pm	2006/06/03 01:47:14	1.272
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/03 22:50:48	1.275
@@ -796,6 +796,8 @@
 
 #############################################################################
 
+# back-buffered drawing area
+
 package CFClient::UI::Window;
 
 our @ISA = CFClient::UI::Bin::;
@@ -957,7 +959,9 @@
 our @ISA = CFClient::UI::HBox::;
 
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
+
+   my $child = delete $arg{child};
 
    my $self;
 
@@ -972,16 +976,21 @@
    $self = $class->SUPER::new (
       vp     => (new CFClient::UI::ViewPort expand => 1),
       slider => $slider,
-      @_,
+      %arg,
    );
 
-   $self->{vp}->add ($self->{scrolled});
-   $self->add ($self->{vp});
-   $self->add ($self->{slider});
+   $self->SUPER::add ($self->{vp}, $self->{slider});
+   $self->add ($child) if $child;
 
    $self
 }
 
+sub add {
+   my ($self, $widget) = @_;
+
+   $self->{vp}->add ($self->{child} = $widget);
+}
+
 sub update {
    my ($self) = @_;
 
@@ -2337,7 +2346,14 @@
 sub update {
    my ($self) = @_;
 
-   $CFClient::UI::ROOT->on_post_alloc ($self => sub {
+   delete $self->{knob_w};
+   $self->SUPER::update;
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   unless ($self->{knob_w}) {
       $self->set_value ($self->{range}[0]);
 
       my ($value, $lo, $hi, $page) = @{$self->{range}};
@@ -2353,13 +2369,7 @@
 
       $self->{knob_x} = $value - $knob_w * 0.5;
       $self->{knob_w} = $knob_w;
-   });
-
-   $self->SUPER::update;
-}
-
-sub _draw {
-   my ($self) = @_;
+   }
 
    $self->SUPER::_draw ();
 
@@ -3024,10 +3034,12 @@
    my $self = $class->SUPER::new (
       buttonbar   => (new CFClient::UI::Buttonbar),
       multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+      # filter => # will be put between multiplexer and $self
       @_,
    );
-
-   $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
+   
+   $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
+   $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
 
    $self
 }
@@ -3173,7 +3185,7 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
+      child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
       @_,
    );
 
@@ -3183,7 +3195,7 @@
 sub set_items {
    my ($self, $items) = @_;
 
-   $self->{scrolled}->clear;
+   $self->{child}->clear;
    return unless $items;
 
    my @items = sort {
@@ -3197,9 +3209,9 @@
    for my $item (@items) {
       CFClient::Item::update_widgets $item;
 
-      $self->{scrolled}->add (0, $row, $item->{face_widget});
-      $self->{scrolled}->add (1, $row, $item->{desc_widget});
-      $self->{scrolled}->add (2, $row, $item->{weight_widget});
+      $self->{child}->add (0, $row, $item->{face_widget});
+      $self->{child}->add (1, $row, $item->{desc_widget});
+      $self->{child}->add (2, $row, $item->{weight_widget});
 
       $row++;
    }
@@ -3406,7 +3418,7 @@
 
 package CFClient::UI::SpellList;
 
-our @ISA = CFClient::UI::ScrolledWindow::;
+our @ISA = CFClient::UI::Table::;
 
 sub new {
    my $class = shift;
@@ -3414,7 +3426,6 @@
    my $self = $class->SUPER::new (
       binding  => [],
       commands => [],
-      scrolled => (new CFClient::UI::Table),
       @_,
    )
 }
@@ -3424,25 +3435,25 @@
    my ($self, $spell) = @_;
    $self->{spells}->{$spell->{name}} = $spell;
 
-   $self->{scrolled}->add (0, $self->{tbl_idx},   new CFClient::UI::Face
+   $self->add (0, $self->{tbl_idx},   new CFClient::UI::Face
       face => $spell->{face},
       can_hover => 1,
       can_events => 1,
       tooltip => $spell->{message});
 
-   $self->{scrolled}->add (1, $self->{tbl_idx},   new CFClient::UI::Label
+   $self->add (1, $self->{tbl_idx},   new CFClient::UI::Label
       text => $spell->{name},
       can_hover => 1,
       can_events => 1,
       tooltip => $spell->{message},
       expand => 1);
 
-   $self->{scrolled}->add (2, $self->{tbl_idx},   new CFClient::UI::Label
+   $self->add (2, $self->{tbl_idx},   new CFClient::UI::Label
       text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
                  $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
       expand => 1);
 
-   $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
+   $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
       text => "bind to key",
       on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
 }