--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/29 16:17:09	1.181
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/30 11:17:08	1.182
@@ -239,6 +239,7 @@
 
       $self->size_allocate ($w, $h);
       $self->update;
+      $self->emit (size_allocate => $w, $h);
    }
 }
 
@@ -249,7 +250,7 @@
 sub children {
 }
 
-# call when resoltuion changes etc.
+# call when resolution changes etc.
 sub reconfigure {
    my ($self) = @_;
 
@@ -541,6 +542,7 @@
    ];
 
    $child->check_size;
+   $self->update;
 }
 
 sub children {
@@ -569,6 +571,9 @@
       delete $_->{parent};
       $_->hide;
    }
+
+   $self->check_size;
+   $self->update;
 }
 
 sub find_widget {
@@ -664,13 +669,18 @@
    $self->update;
 }
 
+sub _render {
+   $_[0]{children}[0]->draw;
+}
+
 sub render_child {
    my ($self) = @_;
 
    $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
-      $self->child->draw;
+
+      $self->_render;
 #      glColorMask 1, 1, 1, 0;
 #      glEnable GL_BLEND;
 #      glBlendFunc GL_SRC_ALPHA, GL_ZERO;
@@ -707,23 +717,72 @@
 
 our @ISA = CFClient::UI::Window::;
 
-sub new { die }
-
 sub size_request {
    my ($self) = @_;
 
    @$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->child->configure (0, 0, @$self{qw(child_w child_h)});
 
    @$self{qw(child_w child_h)}
 }
 
-sub _draw {
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->update;
+}
+
+sub set_offset {
+   my ($self, $x, $y) = @_;
+
+   $self->{view_x} = int $x;
+   $self->{view_y} = int $y;
+
+   $self->update;
+}
+
+sub _render {
    my ($self) = @_;
 
-   $self->{children}[1]->draw;
+   CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+
+   $self->SUPER::_render;
+}
+
+#############################################################################
+
+package CFClient::UI::ScrolledWindow;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+   my $class = shift;
+
+   my $self;
+
+   my $slider = new CFClient::UI::Slider
+      vertical        => 1,
+      range           => [0, 0, 1, 0.01], # HACK fix
+      connect_changed => sub {
+         $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
+      },
+   ;
+
+   $self = $class->SUPER::new (
+      vp     => (new CFClient::UI::ViewPort),
+      slider => $slider,
+      @_,
+   );
+
+   $self->{vp}->add ($self->{scrolled});
+   $self->add ($self->{vp});
+   $self->add ($self->{slider});
+
+   $self
 }
 
+#TODO# update range on size_allocate depeneing on child
+# update viewport offset on scroll
 
 #############################################################################
 
@@ -1959,8 +2018,8 @@
       fg        => [1, 1, 1],
       active_fg => [0, 0, 0],
       range     => [0, 0, 100, 10],
-      req_w     => 20,
-      req_h     => 20,
+      req_w     => $::WIDTH / 80,
+      req_h     => $::WIDTH / 80,
       vertical  => 0,
       can_hover => 1,
       inner_pad => 5,
@@ -2477,7 +2536,7 @@
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 
-   # TODO: should use vbox->fdind_widget or so
+   # TODO: should use vbox->find_widget or so
    $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
    $self->{hover} = $self->{item}{$HOVER};
 }
@@ -2579,29 +2638,25 @@
 
 package CFClient::UI::Inventory;
 
-our @ISA = CFClient::UI::Container::;
-
-use CFClient::OpenGL;
+our @ISA = CFClient::UI::ScrolledWindow::;
 
 sub new {
    my $class = shift;
 
-   my $self = $class->SUPER::new (@_);
+   my $self = $class->SUPER::new (
+      scrolled => (new CFClient::UI::VBox),
+      @_,
+   );
 
    $self
 }
 
-sub size_allocate {
-   my ($self, $w, $h) = @_;
-
-   $self->{w} = $w;
-   $self->{h} = $h;
-
-   $self->check_size;
-}
-
 sub set_items {
    my ($self, $items) = @_;
+
+   $self->{scrolled}->clear;
+   return unless $items;
+
    my @items = sort { $a->{type} <=> $b->{type} } @$items;
 
    $self->{real_items} = \@items;
@@ -2611,7 +2666,7 @@
                      ? $item->{name}
                      : "$item->{nrof} $item->{name_pl}";
 
-      $self->add (my $hb = new CFClient::UI::HBox);
+      my $hb = new CFClient::UI::HBox;
 
       $hb->add (my $f = new CFClient::UI::Face
          can_events => 0,
@@ -2621,15 +2676,10 @@
          expand     => 1,
       );
       $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
+      $self->{scrolled}->add ($hb);
    }
 
-   $self->{max_pos} = (scalar @items) - 1;
-
-   my $range = $self->{range};
-   my $page = $self->{h} / 32; # what information source to use for face size?
-                               # it should be configurable I guess...
-   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
-   $range->update;
+#   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
 }
 
 sub size_request {
@@ -2637,49 +2687,6 @@
    (100, 200)
 }
 
-sub set_range {
-   my ($self, $range) = @_;
-
-   $self->{range} = $range;
-   $range->connect (changed => sub { $self->update });
-
-   my $page = $self->{h} / 32; # waht information souce to use for face size?
-                               # it should be configurable i guess...
-
-   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
-   $range->update;
-
-   $self->update;
-}
-
-sub _draw {
-   my ($self) = @_;
-
-   my ($w, $h) = ($self->{w}, $self->{h});
-
-   $self->{pos} = int $self->{range}{range}[0];
-
-   my $y = 0;
-   my $cnt = 0;
-   my $hrem = $self->{h}; # horiz. remaining space
-
-   for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
-      my $chld = $self->{children}->[$i];
-
-      if ($hrem >= $chld->{h}) {
-         $chld->configure (0, $y, $chld->{w}, $chld->{h});
-
-         $chld->draw;
-
-         $hrem -= $chld->{h};
-         $y += $chld->{h};
-      } else {
-         last
-      }
-   }
-}
-
-
 #############################################################################
 
 package CFClient::UI;