--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/23 21:47:32	1.157
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/24 02:41:48	1.158
@@ -170,8 +170,13 @@
    $self->update;
 }
 
-sub needs_redraw {
-   0
+sub set_size {
+   my ($self, $w, $h) = @_;
+
+   $self->{user_w} = $w;
+   $self->{user_h} = $h;
+
+   $self->check_size;
 }
 
 sub size_request {
@@ -339,15 +344,26 @@
 sub check_size {
    my ($self) = @_;
 
-   return unless $self->{parent};
+   $self->{parent}
+      or return 1;
 
-   my ($w, $h) = $self->size_request;
+   my ($w, $h) = $self->{user_w} && $self->{user_h}
+      ? @$self{qw(user_w user_h)}
+      : $self->size_request;
 
-   if ($w != $self->{req_w}  || $h != $self->{req_h}) {
+   if ($w != $self->{req_w} || $h != $self->{req_h}) {
       $self->{req_w} = $w;
       $self->{req_h} = $h;
 
-      $self->{parent}->check_size;
+      $self->{parent}->check_size
+         or $self->size_allocate (
+               (List::Util::max $self->{w}, $w),
+               (List::Util::max $self->{h}, $h),
+            );
+
+      1
+   } else {
+      0
    }
 }
 
@@ -647,25 +663,6 @@
    $self
 }
 
-sub set_size {
-   my ($self, $w, $h) = @_;
-   $self->{req_w} = $w;
-   $self->{req_h} = $h;
-   $self->check_size;
-}
-
-sub size_request {
-   my ($self) = @_;
-   ($self->{req_w}, $self->{req_h})
-}
-
-sub size_allocate {
-   my ($self, $w, $h) = @_;
-   $self->{w} = $w;
-   $self->{h} = $h;
-   $self->child->configure (0, 0, $w, $h);
-}
-
 sub _draw {
    my ($self) = @_;
 
@@ -731,8 +728,6 @@
 sub size_request {
    my ($self) = @_;
 
-   return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
-
    my ($w, $h) = $self->SUPER::size_request;
 
    (
@@ -1618,6 +1613,8 @@
 
 our @ISA = CFClient::UI::Base::;
 
+use List::Util qw(min max);
+
 use CFClient::OpenGL;
 
 my %tex = (
@@ -1627,7 +1624,7 @@
    ],
    grace => [
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
-         qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
+         qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
    ],
    hp => [
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
@@ -1635,7 +1632,7 @@
    ],
    mana => [
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
-         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
+         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
    ],
 );
 
@@ -1683,6 +1680,7 @@
    my ($self) = @_;
 
    my $tex = $tex{$self->{type}};
+   my ($t1, $t2, $t3) = @$tex;
 
    my ($w, $h) = ($self->{w}, $self->{h});
 
@@ -1694,35 +1692,45 @@
    }
 
    my $ycut = $self->{val} / ($self->{max_val} || 1);
-   $ycut = 1 if $self->{val} > $self->{max_val};
 
-   my $t1 = $tex->[0];
-   my $t2 = $tex->[1];
+   my $ycut1 = max 0, min 1, $ycut;
+   my $ycut2 = max 0, min 1, $ycut - 1;
+
+   my $h1 = $self->{h} * (1 - $ycut1);
+   my $h2 = $self->{h} * (1 - $ycut2);
 
    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;
 
-   my $h1 = $self->{h} - $ycut * $self->{h};
-   my $h2 = $ycut * $self->{h};
-
    glBindTexture GL_TEXTURE_2D, $t1->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , 0;                      glVertex 0 , 0;
-   glTexCoord 0       , $t1->{t} * (1 - $ycut); glVertex 0 , $h1;
-   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1;
-   glTexCoord $t1->{s}, 0;                      glVertex $w, 0;
+   glTexCoord 0       , 0;                       glVertex 0 , 0;
+   glTexCoord 0       , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
+   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
+   glTexCoord $t1->{s}, 0;                       glVertex $w, 0;
    glEnd;
 
+   my $ycut1 = List::Util::min 1, $ycut;
    glBindTexture GL_TEXTURE_2D, $t2->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , $t2->{t} * (1 - $ycut); glVertex 0 , $h1;
-   glTexCoord 0       , $t2->{t};               glVertex 0 , $h1 + $h2;
-   glTexCoord $t2->{s}, $t2->{t};               glVertex $w, $h1 + $h2;
-   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1;
+   glTexCoord 0       , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
+   glTexCoord 0       , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
+   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
+   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
    glEnd;
 
+   if ($t3) {
+      glBindTexture GL_TEXTURE_2D, $t3->{name};
+      glBegin GL_QUADS;
+      glTexCoord 0       , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
+      glTexCoord 0       , $t3->{t};                glVertex 0 , $self->{h};
+      glTexCoord $t3->{s}, $t3->{t};                glVertex $w, $self->{h};
+      glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
+      glEnd;
+   }
+
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }