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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.437 by root, Wed Aug 22 22:36:26 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

    $self->emit ("destroy");
    %$self = ();
 }
 sub TO_JSON {
-   { __w_ => $_[0]{s_id} }
+   { "\fw" => $_[0]{s_id} }
 }
 sub show {
    my ($self) = @_;
    $self->{force_w} = $w;
    $self->{force_h} = $h;
    $self->realloc;
+}
+# travsle the widget chain up to find the maximum "physical" size constraints
+sub get_max_wh {
+   my ($self) = @_;
+   return ($self->{alloc_w}, $self->{alloc_h})
+      if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
+   return $self->{parent}->get_max_wh
+      if $self->{parent};
+   ($::WIDTH, $::HEIGHT)
 }
 sub size_request {
    require Carp;
    Carp::confess "size_request is abstract";
    1
 }
 #############################################################################
 # back-buffered drawing area
 package CFPlus::UI::Window;
 our @ISA = CFPlus::UI::Bin::;
 sub size_request {
    my ($self) = @_;
    $self->{size_req} ||= do {
+      my ($max_w, $max_h) = $self->get_max_wh;
       $self->{layout}->set_font ($self->{font}) if $self->{font};
-      $self->{layout}->set_width ($self->{max_w} || -1);
+      $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
       $self->{layout}->set_ellipsise ($self->{ellipsise});
       $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
       $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
       my ($w, $h) = $self->{layout}->size;

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