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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

… …
794 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795} 795}
796 796
797############################################################################# 797#############################################################################
798 798
799# back-buffered drawing area
800
799package CFClient::UI::Window; 801package CFClient::UI::Window;
800 802
801our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
802 804
803use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
955package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
956 958
957our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
958 960
959sub new { 961sub new {
960 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
961 965
962 my $self; 966 my $self;
963 967
964 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
965 vertical => 1, 969 vertical => 1,
… …
970 ; 974 ;
971 975
972 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
974 slider => $slider, 978 slider => $slider,
975 @_, 979 %arg,
976 ); 980 );
977 981
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
981 984
982 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
983} 992}
984 993
985sub update { 994sub update {
986 my ($self) = @_; 995 my ($self) = @_;
987 996
… …
1667 1676
1668 delete $self->{cur_h}; 1677 delete $self->{cur_h};
1669 1678
1670 return if $self->{text} eq $text; 1679 return if $self->{text} eq $text;
1671 1680
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1681 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1682 $self->{text} = $text;
1676 1683
1677 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1679 1686
1680 $self->_emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688 $self->update;
1681} 1689}
1682 1690
1683sub set_text { 1691sub set_text {
1684 my ($self, $text) = @_; 1692 my ($self, $text) = @_;
1685 1693
… …
2335} 2343}
2336 2344
2337sub update { 2345sub update {
2338 my ($self) = @_; 2346 my ($self) = @_;
2339 2347
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2348 delete $self->{knob_w};
2349 $self->SUPER::update;
2350}
2351
2352sub _draw {
2353 my ($self) = @_;
2354
2355 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2356 $self->set_value ($self->{range}[0]);
2342 2357
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2358 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2359 my $range = ($hi - $page - $lo) || 1e-100;
2345 2360
… …
2351 $value = ($value - $lo) / $range; 2366 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2367 $value = $value * $self->{scale} + $self->{offset};
2353 2368
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2369 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2370 $self->{knob_w} = $knob_w;
2356 }); 2371 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2372
2364 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2365 2374
2366 glScale $self->{w}, $self->{h}; 2375 glScale $self->{w}, $self->{h};
2367 2376
… …
3022 my $class = shift; 3031 my $class = shift;
3023 3032
3024 my $self = $class->SUPER::new ( 3033 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3034 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self
3027 @_, 3037 @_,
3028 ); 3038 );
3029 3039
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3042
3032 $self 3043 $self
3033} 3044}
3034 3045
3035sub add { 3046sub add {
… …
3171 3182
3172sub new { 3183sub new {
3173 my $class = shift; 3184 my $class = shift;
3174 3185
3175 my $self = $class->SUPER::new ( 3186 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3188 @_,
3178 ); 3189 );
3179 3190
3180 $self 3191 $self
3181} 3192}
3182 3193
3183sub set_items { 3194sub set_items {
3184 my ($self, $items) = @_; 3195 my ($self, $items) = @_;
3185 3196
3186 $self->{scrolled}->clear; 3197 $self->{child}->clear;
3187 return unless $items; 3198 return unless $items;
3188 3199
3189 my @items = sort { 3200 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3201 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3202 or ($a->{name} cmp $b->{name})
… …
3195 3206
3196 my $row = 0; 3207 my $row = 0;
3197 for my $item (@items) { 3208 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3209 CFClient::Item::update_widgets $item;
3199 3210
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3211 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3212 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3213 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3214
3204 $row++; 3215 $row++;
3205 } 3216 }
3206} 3217}
3207 3218
… …
3404 3415
3405############################################################################# 3416#############################################################################
3406 3417
3407package CFClient::UI::SpellList; 3418package CFClient::UI::SpellList;
3408 3419
3409our @ISA = CFClient::UI::ScrolledWindow::; 3420our @ISA = CFClient::UI::Table::;
3410 3421
3411sub new { 3422sub new {
3412 my $class = shift; 3423 my $class = shift;
3413 3424
3414 my $self = $class->SUPER::new ( 3425 my $self = $class->SUPER::new (
3415 binding => [], 3426 binding => [],
3416 commands => [], 3427 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3428 @_,
3419 ) 3429 )
3420} 3430}
3421 3431
3422# XXX: Do sorting? Argl... 3432# XXX: Do sorting? Argl...
3423sub add_spell { 3433sub add_spell {
3424 my ($self, $spell) = @_; 3434 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell; 3435 $self->{spells}->{$spell->{name}} = $spell;
3426 3436
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face}, 3438 face => $spell->{face},
3429 can_hover => 1, 3439 can_hover => 1,
3430 can_events => 1, 3440 can_events => 1,
3431 tooltip => $spell->{message}); 3441 tooltip => $spell->{message});
3432 3442
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name}, 3444 text => $spell->{name},
3435 can_hover => 1, 3445 can_hover => 1,
3436 can_events => 1, 3446 can_events => 1,
3437 tooltip => $spell->{message}, 3447 tooltip => $spell->{message},
3438 expand => 1); 3448 expand => 1);
3439 3449
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1); 3453 expand => 1);
3444 3454
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key", 3456 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448} 3458}
3449 3459
3450sub rebuild_spell_list { 3460sub rebuild_spell_list {

Diff Legend

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