--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/14 15:14:25	1.106
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/14 20:27:35	1.107
@@ -1429,6 +1429,8 @@
 
    my ($value, $lo, $hi, $page) = @{$self->{range}};
 
+   $hi = $value + 1 if $lo == $hi;
+
    my $inner_pad_px = $self->_calc_inner_pad_px ($w);
    my $inner_w = $w - $inner_pad_px * 2;               # * 2 for left & right
 
@@ -1484,9 +1486,20 @@
       ],
    );
 
+   $self->{children}[1]->connect (changed => sub {
+      $self->update;
+   });
+
    $self
 }
 
+sub set_fontsize {
+   my ($self, $fontsize) = @_;
+
+   $self->{fontsize} = $fontsize;
+   $self->reflow;
+}
+
 sub text_height {
    my ($self, $text) = @_;
 
@@ -1502,15 +1515,8 @@
 sub reflow {
    my ($self) = @_;
 
-   my $height = 0;
-
-   for (@{$self->{par}}) {
-      $height += $_->[0] = $self->text_height ($_->[2]);
-   }
-
-   $self->{height} = $height;
-
-   $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+   $self->{need_reflow}++;
+   $self->update;
 }
 
 sub size_request {
@@ -1528,7 +1534,6 @@
    $self->{layout}->set_width ($self->{w});
 
    $self->reflow;
-   $self->update;
 }
 
 sub add_paragraph {
@@ -1553,39 +1558,58 @@
 
    return unless $self->{h} > 0;
 
-   $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
-      glClearColor 0, 0, 0, 1;
-      glClear GL_COLOR_BUFFER_BIT;
+   delete $self->{texture};
 
-      my $y0 = $self->{height} - $self->{h};
-      my $y1 = $self->{height};
+   $TOPLEVEL->on_refresh ($self, sub {
+      if (delete $self->{need_reflow}) {
+         my $height = 0;
 
-      glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-      glEnable GL_TEXTURE_2D;
-      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+         $height += $_->[0] = $self->text_height ($_->[2])
+            for @{$self->{par}};
 
-      my $y = 0;
+         $self->{height} = $height;
 
-      my $layout = $self->{layout};
+         $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+         
+         delete $self->{texture};
+      }
 
-      for my $par (@{$self->{par}}) {
-         my $h = $par->[0];
+      $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+         glClearColor 0, 0, 0, 1;
+         glClear GL_COLOR_BUFFER_BIT;
 
-         if ($y0 < $y + $h && $y < $y1) {
-            $layout->set_text ($par->[2]);
+         glEnable GL_BLEND;
+         glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+         glEnable GL_TEXTURE_2D;
+         glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-            glColor @{ $par->[1] };
-            my ($W, $H) = $layout->size;
-            CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
-         }
+         my $top = int $self->{children}[1]{range}[0];
 
-         $y += $h;
-      }
+         my $y0 = $top;
+         my $y1 = $top + $self->{h};
 
-      glDisable GL_TEXTURE_2D;
-      glDisable GL_BLEND;
-   };
+         my $y = 0;
+
+         my $layout = $self->{layout};
+
+         for my $par (@{$self->{par}}) {
+            my $h = $par->[0];
+
+            if ($y0 < $y + $h && $y < $y1) {
+               $layout->set_text ($par->[2]);
+
+               glColor @{ $par->[1] };
+               my ($W, $H) = $layout->size;
+               CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+            }
+
+            $y += $h;
+         }
+
+         glDisable GL_TEXTURE_2D;
+         glDisable GL_BLEND;
+      };
+   });
 }
 
 sub _draw {
@@ -1859,6 +1883,8 @@
 
 our @ISA = CFClient::UI::Container::;
 
+use SDL::OpenGL;
+
 sub size_request {
    ($::WIDTH, $::HEIGHT)
 }
@@ -1893,9 +1919,29 @@
    $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
 }
 
+sub on_refresh {
+   my ($self, $id, $cb) = @_;
+
+   $self->{refresh_hook}{$id} = $cb;
+}
+
 sub draw  {
    my ($self) = @_;
 
+   while (my $rcb = delete $self->{refresh_hook}) {
+      $_->() for values %$rcb;
+   }
+
+   glViewport 0, 0, $::WIDTH, $::HEIGHT;
+   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
+   glClear GL_COLOR_BUFFER_BIT;
+
+   glMatrixMode GL_PROJECTION;
+   glLoadIdentity;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
+   glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
+
    $self->_draw;
 }