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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.224 by elmex, Tue May 23 20:00:55 2006 UTC

… …
209sub show { 209sub show {
210 my ($self) = @_; 210 my ($self) = @_;
211 return if $self->{parent}; 211 return if $self->{parent};
212 212
213 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
214} 227}
215 228
216sub hide { 229sub hide {
217 my ($self) = @_; 230 my ($self) = @_;
218 231
… …
2615 2628
2616 my $self = $class->SUPER::new ( 2629 my $self = $class->SUPER::new (
2617 can_hover => 1, 2630 can_hover => 1,
2618 can_events => 1, 2631 can_events => 1,
2619 tooltip => ((CFClient::UI::Label::escape $desc) 2632 tooltip => ((CFClient::UI::Label::escape $desc)
2620 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2621 connect_button_down => sub { 2634 connect_button_down => sub {
2622 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2623 2636
2624 # todo: maybe put examine on 1? but should just be a tooltip :( 2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2625 if ($ev->{button} == 1) { 2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2626 my $targ = $::CONN->{player}{tag}; 2639 my $targ = $::CONN->{player}{tag};
2627 2640
2628 if ($item->{container} == $::CONN->{player}{tag}) { 2641 if ($item->{container} == $::CONN->{player}{tag}) {
2629 $targ = $main::OPENCONT; 2642 $targ = $main::OPENCONT;
2630 } 2643 }
2631 2644
2632 $::CONN->send ("move $targ $item->{tag} 0"); 2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2633 } elsif ($ev->{button} == 2) { 2648 } elsif ($ev->{button} == 2) {
2634 $::CONN->send ("apply $item->{tag}"); 2649 $::CONN->send ("apply $item->{tag}");
2635 } elsif ($ev->{button} == 3) { 2650 } elsif ($ev->{button} == 3) {
2636 my @menu_items = ( 2651 my @menu_items = (
2637 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2690 2705
2691sub new { 2706sub new {
2692 my $class = shift; 2707 my $class = shift;
2693 2708
2694 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
2695 scrolled => (new CFClient::UI::VBox), 2710 scrolled => (new CFClient::UI::Table),
2696 @_, 2711 @_,
2697 ); 2712 );
2698 2713
2699 $self 2714 $self
2700} 2715}
… …
2711 } @$items; 2726 } @$items;
2712 2727
2713 $self->{real_items} = \@items; 2728 $self->{real_items} = \@items;
2714 2729
2715 for my $item (@items) { 2730 for my $item (@items) {
2731 $item->{item} = $item;
2716 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717 $item->update_item (); 2733 $item->update_item ();
2718 } 2734 }
2719 2735
2736 my $i = 0;
2737 for (@items) {
2720 $self->{scrolled}->add (@items); 2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2721 2742
2722# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723} 2744}
2724 2745
2725sub size_request { 2746sub size_request {

Diff Legend

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