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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388 388
389 $self->realloc; 389 $self->realloc;
390} 390}
391 391
392sub set_tooltip { 392sub set_tooltip {
… …
3076 @_, 3076 @_,
3077 ); 3077 );
3078 3078
3079 Scalar::Util::weaken (my $this = $self); 3079 Scalar::Util::weaken (my $this = $self);
3080 3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3082
3086 $self 3083 $self
3087} 3084}
3088 3085
3089sub reorder { 3086sub reorder {
3090 my ($self) = @_; 3087 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3088 my $NOW = Time::HiRes::time;
3089
3090 # freeze display when hovering over any label
3091 return if $CFClient::UI::TOOLTIP->{owner}
3092 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3093 values %{ $self->{item} };
3092 3094
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3095 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3096 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3097 }
3096 3098
… …
3105 3107
3106 my $count = 10 + 1; 3108 my $count = 10 + 1;
3107 for my $item (@items) { 3109 for my $item (@items) {
3108 last unless --$count; 3110 last unless --$count;
3109 3111
3110 push @widgets, $item->{label} ||= do { 3112 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3113 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3114 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3115 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3116 : $item->{text};
3115 3117
… …
3123 tooltip => $item->{tooltip}, 3125 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3126 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3127 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3128 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3129 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3130 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3131 can_events => 1,
3131 can_hover => 1 3132 can_hover => 1
3132 }; 3133 };
3133 3134
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3135 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3136 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update; 3137 $label->update;
3138 $label->set_max_size (undef, $label->{req_h} * $diff)
3139 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3140 $self->{timer}->interval (1/30);
3141 } else {
3142 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3143 }
3144
3145 push @widgets, $label;
3143 } 3146 }
3144 3147
3145 $self->clear; 3148 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3149 $self->SUPER::add (reverse @widgets);
3147} 3150}

Diff Legend

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