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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.321 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC

 }
 sub DESTROY {
    my ($self) = @_;
+   return if CFClient::in_destruct;
    delete $WIDGET{$self+0};
    eval { $self->destroy };
    warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
 }
    my $self = $class->SUPER::new (
       bg          => [1, 1, 1, 1],
       border_bg   => [1, 1, 1, 1],
       border      => 0.6,
       can_events  => 1,
-      min_w       => 16,
+      min_w       => 64,
-      min_h       => 16,
+      min_h       => 32,
       %arg,
    );
    $self->{title_widget} = new CFClient::UI::Label
       align    => 0,
       #font      => default_font
       #text      => initial text
       #markup    => initial narkup
       #max_w     => maximum pixel width
       ellipsise  => 3, # end
-      layout     => (new CFClient::Layout 2),
+      layout     => (new CFClient::Layout),
       fontsize   => 1,
       align      => -1,
       valign     => -1,
       padding_x  => 2,
       padding_y  => 2,
       can_events => 0,
       %arg
    );
    if (exists $self->{template}) {
-      my $layout = new CFClient::Layout 2;
+      my $layout = new CFClient::Layout;
       $layout->set_text (delete $self->{template});
       $self->{template} = $layout;
    }
    if (exists $self->{markup}) {
       my ($w, $h) = $self->{layout}->size;
       if (exists $self->{template}) {
          $self->{template}->set_font ($self->{font}) if $self->{font};
+         $self->{template}->set_width ($self->{max_w} || -1);
          $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
          my ($w2, $h2) = $self->{template}->size;
          $w = List::Util::max $w, $w2;
       $self->{layout}->set_width ($self->{w});
       $self->{layout}->set_ellipsise ($self->{ellipsise});
       $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
       $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
-      $self->{size_req}
+      [$self->{layout}->size]
    };
    unless (exists $self->{ox}) {
       $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
                        : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
    my $idx = $self->{layout}->xy_to_index ($x, $y);
    # byte-index to char-index
    my $text = $self->{text};
-   utf8::encode $text;
+   utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
-   $self->{cursor} = length substr $text, 0, $idx;
+   $self->{cursor} = length $text;
    $self->_set_text ($self->{text});
    $self->update;
    1
    my $self = $class->SUPER::new (
       can_events => 0,
       @_,
    );
-   $self->{path}
+   $self->{path} || $self->{tex}
-      or Carp::croak "required attribute 'path' not set";
+      or Carp::croak "'path' or 'tex' attributes required";
-   $self->{tex} = $texture_cache{$self->{path}} ||=
+   $self->{tex} ||= $texture_cache{$self->{path}} ||=
       new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
    Scalar::Util::weaken $texture_cache{$self->{path}};
    $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
       can_events => 0,
       indent     => 0,
       #font      => default_font
       @_,
-      layout     => (new CFClient::Layout 2),
+      layout     => (new CFClient::Layout),
       par        => [],
       height     => 0,
       children   => [
          (new CFClient::UI::Empty expand => 1),
          (new CFClient::UI::Slider vertical => 1),
    for my $item (@{ $self->{items} }) {
       my ($widget, $cb, $tooltip) = @$item;
       # handle various types of items, only text for now
       if (!ref $widget) {
+         if ($widget =~ /\t/) {
+            my ($left, $right) = split /\t/, $widget, 2;
+            $widget = new CFClient::UI::HBox
+               can_hover  => 1,
+               can_events => 1,
+               tooltip    => $tooltip,
+               children   => [
+                  (new CFClient::UI::Label markup => $left, expand => 1),
+                  (new CFClient::UI::Label markup => $right, align => +1),
+               ],
+            ;
+         } else {
-         $widget = new CFClient::UI::Label
+            $widget = new CFClient::UI::Label
-            can_hover  => 1,
+               can_hover  => 1,
-            can_events => 1,
+               can_events => 1,
-            markup     => $widget,
+               markup     => $widget,
-            tooltip    => $tooltip
+               tooltip    => $tooltip;
+         }
       }
       $self->{item}{$widget} = $item;
       $self->{vbox}->add ($widget);
          my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
          $w = 0 if $w < 0;
          $h = 0 if $h < 0;
+         $w = max $widget->{min_w}, $w;
+         $h = max $widget->{min_h}, $h;
+         $w = min $widget->{max_w}, $w if exists $widget->{max_w};
+         $h = min $widget->{max_h}, $h if exists $widget->{max_h};
          $w = int $w + 0.5;
          $h = int $h + 0.5;
          if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
             $widget->{old_w} = $widget->{w};

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.321 by root, Tue Jul 4 23:44:23 2006 UTC vs. Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.321 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC