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.430 by root, Tue Aug 21 02:39:17 2007 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 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 text => "-",
2807 value => -1,
2808 ); 2803 );
2809 2804
2810 $self->set_value ($arg{value}) if exists $arg{value}; 2805 $self->set_value ($arg{value} || -1);
2811 2806
2812 $self 2807 $self
2808}
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});
2813} 2817}
2814 2818
2815sub set_value { 2819sub set_value {
2816 my ($self, $value) = @_; 2820 my ($self, $value) = @_;
2817 2821
2818 if ($self->{value} != $value) { 2822 if ($self->{value} ne $value) {
2819 $self->{value} = $value; 2823 $self->{value} = $value;
2824
2825 if ($value < 0) {
2826 $self->set_text ("-");
2827 } else {
2820 $self->set_text (sprintf "%d%%", $value * 100); 2828 $self->set_text (sprintf $self->{label}, $value * 100);
2829 }
2830
2821 $self->update; 2831 $self->update;
2822 } 2832 }
2823} 2833}
2824 2834
2825sub _draw { 2835sub _draw {
… …
2856 2866
2857sub new { 2867sub new {
2858 my ($class, %arg) = @_; 2868 my ($class, %arg) = @_;
2859 2869
2860 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 },
2861 %arg 2880 %arg
2862 ); 2881 );
2863 2882
2864 $::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}) }
2865 if $::CONN; 2884 if $::CONN;
… …
2877} 2896}
2878 2897
2879sub set_value { 2898sub set_value {
2880 my ($self, $lvl, $exp) = @_; 2899 my ($self, $lvl, $exp) = @_;
2881 2900
2901<<<<<<< UI.pm
2902 $self->{lvl} = $lvl;
2903 $self->{exp} = $exp;
2904
2905=======
2906 $self->{lvl} = $exp;
2907 $self->{exp} = $exp;
2908
2909>>>>>>> 1.434
2882 my $v = 0; 2910 my $v = -1;
2883 2911
2884 if ($::CONN && (my $table = $::CONN->{exp_table})) { 2912 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2885 my $l0 = $table->[$lvl - 1]; 2913 my $l0 = $table->[$lvl - 1];
2886 my $l1 = $table->[$lvl]; 2914 my $l1 = $table->[$lvl];
2915
2916 $self->{nxt} = $l1;
2887 2917
2888 $v = ($exp - $l0) / ($l1 - $l0); 2918 $v = ($exp - $l0) / ($l1 - $l0);
2889 } 2919 }
2890 2920
2891 $self->SUPER::set_value ($v); 2921 $self->SUPER::set_value ($v);
… …
3529} 3559}
3530 3560
3531sub set_tooltip_from { 3561sub set_tooltip_from {
3532 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
3533 3563
3534 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3535 if $widget->{tooltip} =~ /^#(.*)$/;
3536
3537 my $tooltip = $widget->{tooltip}; 3564 my $tip = $widget->{tooltip};
3565 $tip = $tip->($widget) if "CODE" eq ref $tip;
3566
3567 $tip = CFPlus::Pod::section_label tooltip => $1
3568 if $tip =~ /^#(.*)$/;
3538 3569
3539 if ($ENV{CFPLUS_DEBUG} & 2) { 3570 if ($ENV{CFPLUS_DEBUG} & 2) {
3540 $tooltip .= "\n\n" . (ref $widget) . "\n" 3571 $tip .= "\n\n" . (ref $widget) . "\n"
3541 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3542 . "req $widget->{req_w} $widget->{req_h}\n" 3573 . "req $widget->{req_w} $widget->{req_h}\n"
3543 . "visible $widget->{visible}"; 3574 . "visible $widget->{visible}";
3544 } 3575 }
3545 3576
3546 $tooltip =~ s/^\n+//; 3577 $tip =~ s/^\n+//;
3547 $tooltip =~ s/\n+$//; 3578 $tip =~ s/\n+$//;
3548 3579
3549 $self->add (new CFPlus::UI::Label 3580 $self->add (new CFPlus::UI::Label
3550 markup => $tooltip, 3581 markup => $tip,
3551 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3552 fontsize => 0.8, 3583 fontsize => 0.8,
3553 style => 1, # FLAG_INVERSE 3584 style => 1, # FLAG_INVERSE
3554 ellipsise => 0, 3585 ellipsise => 0,
3555 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3930 3961
3931############################################################################# 3962#############################################################################
3932 3963
3933package CFPlus::UI::Notebook; 3964package CFPlus::UI::Notebook;
3934 3965
3966use CFPlus::OpenGL;
3967
3935our @ISA = CFPlus::UI::VBox::; 3968our @ISA = CFPlus::UI::VBox::;
3936 3969
3937sub new { 3970sub new {
3938 my $class = shift; 3971 my $class = shift;
3939 3972
3940 my $self = $class->SUPER::new ( 3973 my $self = $class->SUPER::new (
3941 buttonbar => (new CFPlus::UI::Buttonbar), 3974 buttonbar => (new CFPlus::UI::Buttonbar),
3942 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3943 # filter => # will be put between multiplexer and $self 3977 # filter => # will be put between multiplexer and $self
3944 @_, 3978 @_,
3945 ); 3979 );
3946 3980
3947 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
4019sub set_current_page { 4053sub set_current_page {
4020 my ($self, $page) = @_; 4054 my ($self, $page) = @_;
4021 4055
4022 $self->{multiplexer}->set_current_page ($page); 4056 $self->{multiplexer}->set_current_page ($page);
4023 $self->emit (page_changed => $self->{multiplexer}{current}); 4057 $self->emit (page_changed => $self->{multiplexer}{current});
4058}
4059
4060sub _draw {
4061 my ($self) = @_;
4062
4063 $self->SUPER::_draw ();
4064
4065 if (my $cur = $self->{multiplexer}{current}) {
4066 if ($cur = $cur->{c_tab_}) {
4067 glTranslate $cur->{x}, $cur->{y};
4068 glLineWidth 3;
4069 glColor @{$self->{active_outline}};
4070 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4071 glLineWidth 1;
4072 }
4073 }
4024} 4074}
4025 4075
4026############################################################################# 4076#############################################################################
4027 4077
4028package CFPlus::UI::Selector; 4078package CFPlus::UI::Selector;

Diff Legend

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