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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.423 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.428 by root, Mon Aug 20 19:24:22 2007 UTC

                        :                      ($self->{w} - $size->[0]) * 0.5);
       $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
                        : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
                        :                       ($self->{h} - $size->[1]) * 0.5);
+      $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
    };
 #   unless ($self->{list}) {
 #      $self->{list} = CFPlus::OpenGL::glGenList;
 #      CFPlus::OpenGL::glNewList $self->{list};
 #      CFPlus::OpenGL::glEndList;
 #   }
 #
 #   CFPlus::OpenGL::glCallList $self->{list};
-   $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
+   $self->{layout}->draw;
 }
 #sub destroy {
 #   my ($self) = @_;
 #
       can_events => 1,
       @_
    );
 }
+sub invoke_button_down {
+   my ($self, $ev, $x, $y) = @_;
+   1
+}
 sub invoke_button_up {
    my ($self, $ev, $x, $y) = @_;
    $self->emit ("activate")
       if $x >= 0 && $x < $self->{w}
             if ($y0 < $y + $h && $y < $y1) {
                my $layout = $self->get_layout ($para);
                $layout->render ($para->{indent}, $y - $y0);
+               $layout->draw;
                if (my @w = @{ $para->{widget} }) {
                   my @s = $layout->get_shapes;
                   for (@w) {
       $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
       $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
       $self->{timer} = Event->timer (
          parked   => 1,
          cb       => sub {
-            return unless $::CONN && $widget;
+            return unless $::CONN;
+            my $w = $widget
+               or return;
-            ++$widget->{frame};
+            ++$w->{frame};
-            $widget->update_face;
+            $w->update_face;
+            # somehow, $widget can go away
-            $widget->update;
+            $w->update;
-            $widget->update_timer;
+            $w->update_timer;
          },
       );
       $self->update_face;
       $self->update_timer;
       if ($anim && @$anim) {
          delete $self->{wait_face};
          $self->{face} = $anim->[ $self->{frame} % @$anim ];
          if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
             unless ($tex->{name} || $tex->{loading}) {
-               $tex->upload;
+               $tex->upload (sub { $self->reconfigure });
             }
          }
       }
    }
 }
       if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
          if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
             if ($tex->{name}) {
                return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
             } elsif (!$tex->{loading}) {
-               $tex->upload;
+               $tex->upload (sub { $self->reconfigure });
             }
          } else {
             $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
-               $self->realloc;
+               $self->reconfigure;
             });
          }
       }
    }
 }
 sub update {
    my ($self) = @_;
-   $::WANT_REFRESH++;
+   $::WANT_REFRESH->start;
 }
 sub add {
    my ($self, @children) = @_;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.423 by root, Mon Aug 6 05:06:33 2007 UTC vs. Revision 1.428 by root, Mon Aug 20 19:24:22 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.423 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.428 by root, Mon Aug 20 19:24:22 2007 UTC