[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

 our $BUTTON_STATE;
 our %WIDGET; # all widgets, weak-referenced
 our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
-   return if $ENV{CFPLUS_DEBUG} & 8;
    if (!$GRAB) {
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
          if (length $widget->{tooltip}) {
             if ($TOOLTIP->{owner} != $widget) {
                $TOOLTIP->hide;
                $TOOLTIP->{owner} = $widget;
+               return if $ENV{CFPLUS_DEBUG} & 8;
                my $tip = $widget->{tooltip};
                $tip = $tip->($widget) if CODE:: eq ref $tip;
                        : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
                        :                       ($self->{h} - $tex->{h}) * 0.5);
    };
    glEnable GL_TEXTURE_2D;
+   if ($tex->{format} == GL_ALPHA) {
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+      glColor @{$self->{fg}};
+      $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
+   } else {
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glColor_premultiply @{$self->{fg}}
-      if $tex->{format} == GL_ALPHA;
-   $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+      $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+   }
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines