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.432 by root, Tue Aug 21 23:42:02 2007 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
2800 fontsize => 0.9, 2796 fontsize => 0.9,
2801 valign => 0, 2797 valign => 0,
2802 align => 0, 2798 align => 0,
2803 can_events => 1, 2799 can_events => 1,
2804 ellipsise => 1, 2800 ellipsise => 1,
2801 label => "%d%%",
2805 %arg, 2802 %arg,
2806 ); 2803 );
2807 2804
2808 $self->set_value ($arg{value} || -1); 2805 $self->set_value ($arg{value} || -1);
2809 2806
2810 $self 2807 $self
2811} 2808}
2812 2809
2810sub set_label {
2811 my ($self, $label) = @_;
2812
2813 return if $self->{label} eq $label;
2814 $self->{label} = $label;
2815
2816 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2817}
2818
2813sub set_value { 2819sub set_value {
2814 my ($self, $value) = @_; 2820 my ($self, $value) = @_;
2815 2821
2816 if ($self->{value} != $value) { 2822 if ($self->{value} ne $value) {
2817 $self->{value} = $value; 2823 $self->{value} = $value;
2818 2824
2819 if ($value < 0) { 2825 if ($value < 0) {
2820 $self->set_text ("-"); 2826 $self->set_text ("-");
2821 } else { 2827 } else {
2822 $self->set_text (sprintf "%d%%", $value * 100); 2828 $self->set_text (sprintf $self->{label}, $value * 100);
2823 } 2829 }
2830
2824 $self->update; 2831 $self->update;
2825 } 2832 }
2826} 2833}
2827 2834
2828sub _draw { 2835sub _draw {
… …
2859 2866
2860sub new { 2867sub new {
2861 my ($class, %arg) = @_; 2868 my ($class, %arg) = @_;
2862 2869
2863 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2871 tooltip => sub {
2872 my ($self) = @_;
2873
2874 sprintf "level %d\n%s points\n%s next level\n%s to go",
2875 $self->{lvl},
2876 ::formsep ($self->{exp}),
2877 ::formsep ($self->{nxt}),
2878 ::formsep ($self->{nxt} - $self->{exp}),
2879 },
2864 %arg 2880 %arg
2865 ); 2881 );
2866 2882
2867 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2883 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2868 if $::CONN; 2884 if $::CONN;
… …
2879 $self->SUPER::DESTROY; 2895 $self->SUPER::DESTROY;
2880} 2896}
2881 2897
2882sub set_value { 2898sub set_value {
2883 my ($self, $lvl, $exp) = @_; 2899 my ($self, $lvl, $exp) = @_;
2900
2901 $self->{lvl} = $lvl;
2902 $self->{exp} = $exp;
2884 2903
2885 my $v = -1; 2904 my $v = -1;
2886 2905
2887 if ($::CONN && (my $table = $::CONN->{exp_table})) { 2906 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2888 my $l0 = $table->[$lvl - 1]; 2907 my $l0 = $table->[$lvl - 1];
2889 my $l1 = $table->[$lvl]; 2908 my $l1 = $table->[$lvl];
2909
2910 $self->{nxt} = $l1;
2890 2911
2891 $v = ($exp - $l0) / ($l1 - $l0); 2912 $v = ($exp - $l0) / ($l1 - $l0);
2892 } 2913 }
2893 2914
2894 $self->SUPER::set_value ($v); 2915 $self->SUPER::set_value ($v);
… …
3532} 3553}
3533 3554
3534sub set_tooltip_from { 3555sub set_tooltip_from {
3535 my ($self, $widget) = @_; 3556 my ($self, $widget) = @_;
3536 3557
3537 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3538 if $widget->{tooltip} =~ /^#(.*)$/;
3539
3540 my $tooltip = $widget->{tooltip}; 3558 my $tip = $widget->{tooltip};
3559 $tip = $tip->($widget) if "CODE" eq ref $tip;
3560
3561 $tip = CFPlus::Pod::section_label tooltip => $1
3562 if $tip =~ /^#(.*)$/;
3541 3563
3542 if ($ENV{CFPLUS_DEBUG} & 2) { 3564 if ($ENV{CFPLUS_DEBUG} & 2) {
3543 $tooltip .= "\n\n" . (ref $widget) . "\n" 3565 $tip .= "\n\n" . (ref $widget) . "\n"
3544 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3566 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3545 . "req $widget->{req_w} $widget->{req_h}\n" 3567 . "req $widget->{req_w} $widget->{req_h}\n"
3546 . "visible $widget->{visible}"; 3568 . "visible $widget->{visible}";
3547 } 3569 }
3548 3570
3549 $tooltip =~ s/^\n+//; 3571 $tip =~ s/^\n+//;
3550 $tooltip =~ s/\n+$//; 3572 $tip =~ s/\n+$//;
3551 3573
3552 $self->add (new CFPlus::UI::Label 3574 $self->add (new CFPlus::UI::Label
3553 markup => $tooltip, 3575 markup => $tip,
3554 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3576 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3555 fontsize => 0.8, 3577 fontsize => 0.8,
3556 style => 1, # FLAG_INVERSE 3578 style => 1, # FLAG_INVERSE
3557 ellipsise => 0, 3579 ellipsise => 0,
3558 font => ($widget->{tooltip_font} || $::FONT_PROP), 3580 font => ($widget->{tooltip_font} || $::FONT_PROP),

Diff Legend

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