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.275 by root, Sat Jun 3 22:50:48 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
… …
2335} 2344}
2336 2345
2337sub update { 2346sub update {
2338 my ($self) = @_; 2347 my ($self) = @_;
2339 2348
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2349 delete $self->{knob_w};
2350 $self->SUPER::update;
2351}
2352
2353sub _draw {
2354 my ($self) = @_;
2355
2356 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2357 $self->set_value ($self->{range}[0]);
2342 2358
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2359 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2360 my $range = ($hi - $page - $lo) || 1e-100;
2345 2361
… …
2351 $value = ($value - $lo) / $range; 2367 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2368 $value = $value * $self->{scale} + $self->{offset};
2353 2369
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2370 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2371 $self->{knob_w} = $knob_w;
2356 }); 2372 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2373
2364 $self->SUPER::_draw (); 2374 $self->SUPER::_draw ();
2365 2375
2366 glScale $self->{w}, $self->{h}; 2376 glScale $self->{w}, $self->{h};
2367 2377
… …
3022 my $class = shift; 3032 my $class = shift;
3023 3033
3024 my $self = $class->SUPER::new ( 3034 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3035 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self
3027 @_, 3038 @_,
3028 ); 3039 );
3029 3040
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3042 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3043
3032 $self 3044 $self
3033} 3045}
3034 3046
3035sub add { 3047sub add {
… …
3171 3183
3172sub new { 3184sub new {
3173 my $class = shift; 3185 my $class = shift;
3174 3186
3175 my $self = $class->SUPER::new ( 3187 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_, 3189 @_,
3178 ); 3190 );
3179 3191
3180 $self 3192 $self
3181} 3193}
3182 3194
3183sub set_items { 3195sub set_items {
3184 my ($self, $items) = @_; 3196 my ($self, $items) = @_;
3185 3197
3186 $self->{scrolled}->clear; 3198 $self->{child}->clear;
3187 return unless $items; 3199 return unless $items;
3188 3200
3189 my @items = sort { 3201 my @items = sort {
3190 ($a->{type} <=> $b->{type}) 3202 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name}) 3203 or ($a->{name} cmp $b->{name})
… …
3195 3207
3196 my $row = 0; 3208 my $row = 0;
3197 for my $item (@items) { 3209 for my $item (@items) {
3198 CFClient::Item::update_widgets $item; 3210 CFClient::Item::update_widgets $item;
3199 3211
3200 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3212 $self->{child}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3213 $self->{child}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3214 $self->{child}->add (2, $row, $item->{weight_widget});
3203 3215
3204 $row++; 3216 $row++;
3205 } 3217 }
3206} 3218}
3207 3219
… …
3404 3416
3405############################################################################# 3417#############################################################################
3406 3418
3407package CFClient::UI::SpellList; 3419package CFClient::UI::SpellList;
3408 3420
3409our @ISA = CFClient::UI::ScrolledWindow::; 3421our @ISA = CFClient::UI::Table::;
3410 3422
3411sub new { 3423sub new {
3412 my $class = shift; 3424 my $class = shift;
3413 3425
3414 my $self = $class->SUPER::new ( 3426 my $self = $class->SUPER::new (
3415 binding => [], 3427 binding => [],
3416 commands => [], 3428 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3429 @_,
3419 ) 3430 )
3420} 3431}
3421 3432
3422# XXX: Do sorting? Argl... 3433# XXX: Do sorting? Argl...
3423sub add_spell { 3434sub add_spell {
3424 my ($self, $spell) = @_; 3435 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell; 3436 $self->{spells}->{$spell->{name}} = $spell;
3426 3437
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face}, 3439 face => $spell->{face},
3429 can_hover => 1, 3440 can_hover => 1,
3430 can_events => 1, 3441 can_events => 1,
3431 tooltip => $spell->{message}); 3442 tooltip => $spell->{message});
3432 3443
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name}, 3445 text => $spell->{name},
3435 can_hover => 1, 3446 can_hover => 1,
3436 can_events => 1, 3447 can_events => 1,
3437 tooltip => $spell->{message}, 3448 tooltip => $spell->{message},
3438 expand => 1); 3449 expand => 1);
3439 3450
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1); 3454 expand => 1);
3444 3455
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key", 3457 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448} 3459}
3449 3460
3450sub rebuild_spell_list { 3461sub rebuild_spell_list {

Diff Legend

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