--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/25 16:24:44	1.234
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/26 20:50:35	1.241
@@ -7,6 +7,7 @@
 use List::Util ();
 
 use CFClient;
+use CFClient::Texture;
 
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 
@@ -230,6 +231,7 @@
 
    # broken show/hide model
 
+   delete $self->{root};
    delete $self->{visible};
 
    undef $GRAB  if $GRAB  == $self;
@@ -460,6 +462,9 @@
 
    Scalar::Util::weaken ($self->{parent} = $parent);
 
+   $self->{root}    = $parent->{root};
+   $self->{visible} = $parent->{visible} + 1;
+
    # TODO: req_w _does_change after ->reconfigure
    $self->check_size
       unless exists $self->{req_w};
@@ -620,7 +625,7 @@
 
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
-   $self->check_size;
+   $self->check_size (1);
    $self->update;
 }
 
@@ -875,6 +880,16 @@
    $self
 }
 
+sub update {
+   my ($self) = @_;
+
+   $self->SUPER::update;
+
+   # todo: overwrite size_allocate of child
+   my $child = $self->{vp}->child;
+   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
+}
+
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
@@ -1103,20 +1118,20 @@
    )
 }
 
+sub children {
+   grep $_, map @$_, grep $_, @{ $_[0]{children} }
+}
+
 sub add {
    my ($self, $x, $y, $child) = @_;
 
    $child->set_parent ($self);
    $self->{children}[$y][$x] = $child;
 
-   $child->check_size;
-}
-
-sub children {
-   grep $_, map @$_, grep $_, @{ $_[0]{children} }
+   $self->check_size (1);
 }
 
-# TODO: move to container class maybe? send childs a signal on removal?
+# TODO: move to container class maybe? send children a signal on removal?
 sub clear {
    my ($self) = @_;
 
@@ -1128,6 +1143,7 @@
       $_->hide;
    }
 
+   $self->check_size (1);
    $self->update;
 }
 
@@ -1169,8 +1185,8 @@
 
    my ($ws, $hs) = $self->get_wh;
 
-   my $req_w = sum @$ws;
-   my $req_h = sum @$hs;
+   my $req_w = (sum @$ws) || 1;
+   my $req_h = (sum @$hs) || 1;
 
    # TODO: nicer code && do row_expand
    my @col_expand = @{$self->{col_expand}};
@@ -2134,9 +2150,10 @@
 sub set_range {
    my ($self, $range) = @_;
 
-   $self->{range} = $range;
+   ($range, $self->{range}) = ($self->{range}, $range);
 
-   $self->update;
+   $self->update
+      if "@$range" ne "@{$self->{range}}";
 }
 
 sub set_value {
@@ -2711,92 +2728,6 @@
 
 #############################################################################
 
-package CFClient::UI::InventoryItem;
-
-our @ISA = CFClient::UI::HBox::;
-
-sub new {
-   my $class = shift;
-
-   my %args = @_;
-
-   my $item = delete $args{item};
-
-   my $desc = CFClient::Item::desc_string $item;
-
-   my $self = $class->SUPER::new (
-      can_hover  => 1,
-      can_events => 1,
-      tooltip    => ((CFClient::UI::Label::escape $desc)
-                 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
-      connect_button_down => sub {
-         my ($self, $ev, $x, $y) = @_;
-
-         # todo: maybe put examine on 1? but should just be a tooltip :(
-         if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
-            my $targ = $::CONN->{player}{tag};
-
-            if ($item->{container} == $::CONN->{player}{tag}) {
-               $targ = $main::OPENCONT;
-            }
-
-            $::CONN->send ("move $targ $item->{tag} 0");
-         } elsif ($ev->{button} == 1) {
-            $::CONN->send ("examine $item->{tag}");
-         } elsif ($ev->{button} == 2) {
-            $::CONN->send ("apply $item->{tag}");
-         } elsif ($ev->{button} == 3) {
-            my @menu_items = (
-               ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
-               ["mark",    sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
-               ["apply",   sub { $::CONN->send ("apply $item->{tag}") }],
-               (
-                  $item->{flags} & Crossfire::Protocol::F_LOCKED
-                  ? (
-                     ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
-                    )
-                  : (
-                     ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
-                     ["drop",   sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
-                  )
-               ),
-            );
-
-            CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
-         }
-
-         1
-      },
-      %args
-   );
-
-
-   $self->add (new CFClient::UI::Face
-      can_events => 0,
-      face       => $item->{face},
-      anim       => $item->{anim},
-      animspeed  => $item->{animspeed},
-   );
-
-   $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
-
-   $self->{item} = $item;
-
-   $self->update_item;
-
-   $self
-}
-
-sub update_item {
-   my ($self) = @_;
-
-   my $desc = CFClient::Item::desc_string ($self->{item});
-
-   $self->{name_lbl}->set_text ($desc);
-}
-
-#############################################################################
-
 package CFClient::UI::Inventory;
 
 our @ISA = CFClient::UI::ScrolledWindow::;
@@ -2835,8 +2766,6 @@
 
       $row++;
    }
-
-#   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
 }
 
 sub size_request {
@@ -3038,6 +2967,7 @@
    my $class = shift;
 
    $class->SUPER::new (
+      visible => 1,
       @_,
    )
 }
@@ -3105,8 +3035,8 @@
 
    for (my @widgets = @children; my $w = pop @widgets; ) {
       push @widgets, $w->children;
-      $w->{root} = $self;
-      $w->{visible} = 1;
+      $w->{root}    = $self;
+      $w->{visible} = $self->{visible} + 1;
    }
 
    for my $child (@children) {