--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/17 14:55:14	1.212
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/17 15:18:57	1.213
@@ -142,7 +142,10 @@
 sub rescale_widgets {
    my ($sx, $sy) = @_;
 
-   for my $widget (values %WIDGET) {
+   # make a copy, otherwise for complains about freed values.
+   my @widgets = values %WIDGET;
+
+   for my $widget (@widgets) {
       if ($widget->{toplevel}) {
          $widget->{x}      = int 0.5 + $widget->{x}      * $sx if exists $widget->{x};
          $widget->{w}      = int 0.5 + $widget->{w}      * $sx if exists $widget->{w};
@@ -1299,6 +1302,8 @@
       #font      => default_font
       #text      => initial text
       #markup    => initial narkup
+      #max_w     => maximum pixel width
+      ellipsise  => 3, # end
       layout     => (new CFClient::Layout),
       fontsize   => 1,
       align      => -1,
@@ -1373,6 +1378,8 @@
 
    $self->{layout}->set_font ($self->{font}) if $self->{font};
    $self->{layout}->set_width ($self->{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;
@@ -1418,7 +1425,9 @@
       $self->{layout}->set_foreground (@{$self->{fg}});
       $self->{layout}->set_font ($self->{font}) if $self->{font};
       $self->{layout}->set_width ($self->{w});
-      $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
+      $self->{layout}->set_ellipsise ($self->{ellipsise});
+      $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
+      $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
       my $tex = new_from_layout CFClient::Texture $self->{layout};
 
@@ -2428,11 +2437,12 @@
    my ($self, $widget) = @_;
 
    $self->add (new CFClient::UI::Label
-      markup   => $widget->{tooltip},
-      max_w    => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
-      fontsize => 0.8,
-      fg       => [0, 0, 0, 1],
-      font     => ($widget->{tooltip_font} || $::FONT_PROP),
+      markup    => $widget->{tooltip},
+      max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+      fontsize  => 0.8,
+      fg        => [0, 0, 0, 1],
+      ellipsise => 0,
+      font      => ($widget->{tooltip_font} || $::FONT_PROP),
    );
 }
 
@@ -2776,13 +2786,9 @@
                      ? "<b>$item->{count} ×</b> $item->{text}"
                      : $item->{text};
 
-         my $fontsize = $item->{fontsize} || $self->{fontsize};
-
          for ($short) {
             s/^\s+//;
             s/\s+/ /g;
-            my $len = int 40 / $fontsize;
-            substr $_, $len, length, "…" if $len < length;
          }
 
          new CFClient::UI::Label
@@ -2790,7 +2796,8 @@
             tooltip       => $item->{tooltip},
             tooltip_font  => $::FONT_PROP,
             tooltip_width => 0.67,
-            fontsize      => $fontsize,
+            fontsize      => $item->{fontsize} || $self->{fontsize},
+            max_w         => $::WIDTH * 0.44,
             fg            => $item->{fg},
             can_events    => 1,
             can_hover     => 1
@@ -2837,6 +2844,16 @@
    $self->reorder;
 }
 
+sub reconfigure {
+   my ($self) = @_;
+
+   delete $_->{label}
+      for values %{ $self->{item} || {} };
+
+   $self->reorder;
+   $self->SUPER::reconfigure;
+}
+
 #############################################################################
 
 package CFClient::UI::Root;
@@ -3019,7 +3036,7 @@
 package CFClient::UI;
 
 $ROOT = new CFClient::UI::Root;
-$TOOLTIP = new CFClient::UI::Tooltip;
+$TOOLTIP = new CFClient::UI::Tooltip z => 900;
 
 1