--- deliantra/Deliantra-Client/DC/UI.pm 2006/06/07 05:48:53 1.296 +++ deliantra/Deliantra-Client/DC/UI.pm 2006/06/07 06:28:30 1.297 @@ -2469,7 +2469,7 @@ ############################################################################# -package CFClient::UI::TextView; +package CFClient::UI::TextScroller; our @ISA = CFClient::UI::HBox::; @@ -3112,7 +3112,7 @@ my $class = shift; my $self = $class->SUPER::new ( - options => [], # [title, value, tooltip], ... + options => [], # [value, title, longdesc], ... value => undef, @_, ); @@ -3128,9 +3128,9 @@ my @menu_items; for (@{ $self->{options} }) { - my ($title, $value, $tooltip) = @$_; + my ($value, $title, $tooltip) = @$_; - push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; + push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; } CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); @@ -3139,11 +3139,11 @@ sub _set_value { my ($self, $value) = @_; - my ($item) = grep $_->[1] eq $value, @{ $self->{options} } + my ($item) = grep $_->[0] eq $value, @{ $self->{options} } or return; - $self->{value} = $item->[1]; - $self->set_markup ("$item->[0] ⇓"); + $self->{value} = $item->[0]; + $self->set_markup ("$item->[1] ⇓"); $self->set_tooltip ($item->[2]); }