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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC vs.
Revision 1.479 by root, Thu Feb 4 20:01:09 2010 UTC

 package DC::UI;
-use utf8;
+use common::sense;
-use strict;
 use List::Util ();
 use Guard ();
 }
 sub _draw {
    my ($self) = @_;
-   my $color = $FOCUS == $self && $self->{active_bg}
+   my $color = $FOCUS == $self
-             ? $self->{active_bg}
+             ? $self->{active_bg} || $self->{bg}
              : $self->{bg};
    if ($color && (@$color < 4 || $color->[3])) {
       my ($w, $h) = @$self{qw(w h)};
 #############################################################################
 package DC::UI::Image;
-our @ISA = DC::UI::Base::;
+our @ISA = DC::UI::DrawBG::;
 use DC::OpenGL;
 our %texture_cache;
    my ($self, $cloning, $path) = @_;
    $self->new (path => $path)
 }
+sub set_texture {
+   my ($self, $tex) = @_;
+   $self->{tex} = $tex;
+   $self->update;
+}
 sub size_request {
    my ($self) = @_;
    (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
 }
 sub _draw {
    my ($self) = @_;
+   $self->SUPER::_draw;
    my $tex = $self->{tex};
    my ($w, $h) = ($self->{w}, $self->{h});
 package DC::UI::ImageButton;
 our @ISA = DC::UI::Image::;
 use DC::OpenGL;
-my %textures;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (

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