ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.295 by root, Tue Jun 6 09:19:28 2006 UTC vs.
Revision 1.297 by root, Wed Jun 7 06:28:30 2006 UTC

315} 315}
316 316
317sub move_abs { 317sub move_abs {
318 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
319 319
320 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
323 323
324 $self->update; 324 $self->update;
325} 325}
326 326
2467sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2469 2469
2470############################################################################# 2470#############################################################################
2471 2471
2472package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2473 2473
2474our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2475 2475
2476use CFClient::OpenGL; 2476use CFClient::OpenGL;
2477 2477
2789 or return; 2789 or return;
2790 2790
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792 2792
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $::WIDTH; 2794 if $x + $self->{w} > $self->{root}{w};
2795 2795
2796 $self->move_abs ($x, $y); 2796 $self->move_abs ($x, $y);
2797 }); 2797 });
2798} 2798}
2799 2799
3110 3110
3111sub new { 3111sub new {
3112 my $class = shift; 3112 my $class = shift;
3113 3113
3114 my $self = $class->SUPER::new ( 3114 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3115 options => [], # [value, title, longdesc], ...
3116 value => undef, 3116 value => undef,
3117 @_, 3117 @_,
3118 ); 3118 );
3119 3119
3120 $self->_set_value ($self->{value}); 3120 $self->_set_value ($self->{value});
3126 my ($self, $ev) = @_; 3126 my ($self, $ev) = @_;
3127 3127
3128 my @menu_items; 3128 my @menu_items;
3129 3129
3130 for (@{ $self->{options} }) { 3130 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3131 my ($value, $title, $tooltip) = @$_;
3132 3132
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3133 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3134 }
3135 3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3137}
3138 3138
3139sub _set_value { 3139sub _set_value {
3140 my ($self, $value) = @_; 3140 my ($self, $value) = @_;
3141 3141
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3142 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3143 or return;
3144 3144
3145 $self->{value} = $item->[1]; 3145 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3146 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3147 $self->set_tooltip ($item->[2]);
3148} 3148}
3149 3149
3150sub set_value { 3150sub set_value {
3151 my ($self, $value) = @_; 3151 my ($self, $value) = @_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines