--- deliantra/Deliantra-Client/DC/UI.pm	2006/06/04 00:21:52	1.277
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/06/04 23:05:06	1.278
@@ -550,20 +550,16 @@
 
    glPushMatrix;
    glTranslate $self->{x}, $self->{y}, 0;
-   $self->_draw;
-   glPopMatrix;
 
    if ($self == $HOVER && $self->{can_hover}) {
-      my ($x, $y) = @$self{qw(x y)};
-
-      glColor 1, 0.8, 0.5, 0.2;
+      glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
       glBegin GL_QUADS;
-      glVertex $x             , $y;
-      glVertex $x + $self->{w}, $y;
-      glVertex $x + $self->{w}, $y + $self->{h};
-      glVertex $x             , $y + $self->{h};
+      glVertex 0         , 0;
+      glVertex $self->{w}, 0;
+      glVertex $self->{w}, $self->{h};
+      glVertex 0         , $self->{h};
       glEnd;
       glDisable GL_BLEND;
    }
@@ -571,7 +567,7 @@
    if ($ENV{CFPLUS_DEBUG} & 1) {
       glPushMatrix;
       glColor 1, 1, 0, 1;
-      glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
+      glTranslate 0.375, 0.375;
       glBegin GL_LINE_LOOP;
       glVertex 0             , 0;
       glVertex $self->{w} - 1, 0;
@@ -581,6 +577,9 @@
       glPopMatrix;
       #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
    }
+
+   $self->_draw;
+   glPopMatrix;
 }
 
 sub _draw {
@@ -628,8 +627,8 @@
       my ($w, $h) = @$self{qw(w h)};
 
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-      glColor @$color;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+      glColor_premultiply @$color;
 
       glBegin GL_QUADS;
       glVertex 0 , 0;
@@ -858,10 +857,13 @@
 
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glColor 1, 1, 1, 1;
+   glEnable GL_BLEND;
+   glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+   glColor 0, 0, 0, 1;
 
-   $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
+   $tex->draw_quad (0, 0, $w, $h);
 
+   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 
@@ -1037,8 +1039,8 @@
       my ($w, $h) = @$self{qw(w h)};
 
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-      glColor @{ $self->{bg} };
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+      glColor_premultiply @{ $self->{bg} };
 
       glBegin GL_QUADS;
       glVertex 0 , 0;
@@ -1786,14 +1788,14 @@
    local $self->{fg} = $self->{fg};
 
    if ($FOCUS == $self) {
-      glColor @{$self->{active_bg}};
+      glColor_premultiply @{$self->{active_bg}};
       $self->{fg} = $self->{active_fg};
    } else {
-      glColor @{$self->{bg}};
+      glColor_premultiply @{$self->{bg}};
    }
 
    glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
    glBegin GL_QUADS;
    glVertex 0         , 0;
    glVertex 0         , $self->{h};
@@ -2152,7 +2154,8 @@
    my $h2 = $self->{h} * (1 - $ycut2);
 
    glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+                       GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;