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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 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
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
1536 1538
1537 delete $self->{texture}; 1539 delete $self->{texture};
1538 $self->SUPER::update; 1540 $self->SUPER::update;
1539} 1541}
1540 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1541sub set_text { 1551sub set_text {
1542 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1543 1553
1544 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
… …
1567} 1577}
1568 1578
1569sub size_request { 1579sub size_request {
1570 my ($self) = @_; 1580 my ($self) = @_;
1571 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1590
1578 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1579 1592
1580 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1596
1584 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1585 1598
1586 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1588 } 1601 }
1589 1602
1590 ($w, $h) 1603 ($w, $h)
1604 }
1591} 1605}
1592 1606
1593sub size_allocate { 1607sub size_allocate {
1594 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1595 1609
… …
3067our @ISA = CFClient::UI::VBox::; 3081our @ISA = CFClient::UI::VBox::;
3068 3082
3069sub new { 3083sub new {
3070 my $class = shift; 3084 my $class = shift;
3071 3085
3072 $class->SUPER::new ( 3086 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3087 fontsize => 0.8,
3074 @_, 3088 @_,
3075 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
3076} 3096}
3077 3097
3078sub reorder { 3098sub reorder {
3079 my ($self) = @_; 3099 my ($self) = @_;
3080 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
3081 3106
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3109 }
3085 3110
… …
3088 my @items = sort { 3113 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
3092 3117
3118 $self->{timer}->interval (1);
3119
3093 my $count = 10 + 1; 3120 my $count = 10 + 1;
3094 for my $item (@items) { 3121 for my $item (@items) {
3095 last unless --$count; 3122 last unless --$count;
3096 3123
3097 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3128 : $item->{text};
3102 3129
… …
3110 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3143 can_events => 1,
3117 can_hover => 1 3144 can_hover => 1
3118 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
3119 } 3158 }
3120 3159
3121 $self->clear; 3160 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
3123} 3162}
… …
3128 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
3130 3169
3131 return unless $text; 3170 return unless $text;
3132 3171
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3173
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3175
3137 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
… …
3168 3207
3169 $self->reorder; 3208 $self->reorder;
3170 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
3171} 3210}
3172 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
3173############################################################################# 3220#############################################################################
3174 3221
3175package CFClient::UI::Inventory; 3222package CFClient::UI::Inventory;
3176 3223
3177our @ISA = CFClient::UI::ScrolledWindow::; 3224our @ISA = CFClient::UI::ScrolledWindow::;
… …
3469 3516
3470package CFClient::UI::Root; 3517package CFClient::UI::Root;
3471 3518
3472our @ISA = CFClient::UI::Container::; 3519our @ISA = CFClient::UI::Container::;
3473 3520
3521use List::Util qw(min max);
3522
3474use CFClient::OpenGL; 3523use CFClient::OpenGL;
3475 3524
3476sub new { 3525sub new {
3477 my $class = shift; 3526 my $class = shift;
3478 3527
… …
3612 3661
3613 delete $queue{$widget+0}; 3662 delete $queue{$widget+0};
3614 3663
3615 my ($w, $h) = $widget->size_request; 3664 my ($w, $h) = $widget->size_request;
3616 3665
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3671
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3672 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3673 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3674
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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