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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.241 by root, Fri May 26 20:50:35 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
13our $ROOT; 14our $ROOT;
14our $TOOLTIP; 15our $TOOLTIP;
… …
228sub set_invisible { 229sub set_invisible {
229 my ($self) = @_; 230 my ($self) = @_;
230 231
231 # broken show/hide model 232 # broken show/hide model
232 233
234 delete $self->{root};
233 delete $self->{visible}; 235 delete $self->{visible};
234 236
235 undef $GRAB if $GRAB == $self; 237 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 238 undef $HOVER if $HOVER == $self;
237 239
… …
459 my ($self, $parent) = @_; 461 my ($self, $parent) = @_;
460 462
461 Scalar::Util::weaken ($self->{parent} = $parent); 463 Scalar::Util::weaken ($self->{parent} = $parent);
462 464
463 $self->{root} = $parent->{root}; 465 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible}; 466 $self->{visible} = $parent->{visible} + 1;
465 467
466 # TODO: req_w _does_change after ->reconfigure 468 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size 469 $self->check_size
468 unless exists $self->{req_w}; 470 unless exists $self->{req_w};
469 471
… …
874 $self->{vp}->add ($self->{scrolled}); 876 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp}); 877 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 878 $self->add ($self->{slider});
877 879
878 $self 880 $self
881}
882
883sub update {
884 my ($self) = @_;
885
886 $self->SUPER::update;
887
888 # todo: overwrite size_allocate of child
889 my $child = $self->{vp}->child;
890 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879} 891}
880 892
881sub size_allocate { 893sub size_allocate {
882 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
883 895
… …
2136} 2148}
2137 2149
2138sub set_range { 2150sub set_range {
2139 my ($self, $range) = @_; 2151 my ($self, $range) = @_;
2140 2152
2141 $self->{range} = $range; 2153 ($range, $self->{range}) = ($self->{range}, $range);
2142 2154
2143 $self->update; 2155 $self->update
2156 if "@$range" ne "@{$self->{range}}";
2144} 2157}
2145 2158
2146sub set_value { 2159sub set_value {
2147 my ($self, $value) = @_; 2160 my ($self, $value) = @_;
2148 2161
… …
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753 2766
2754 $row++; 2767 $row++;
2755 } 2768 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758} 2769}
2759 2770
2760sub size_request { 2771sub size_request {
2761 my ($self) = @_; 2772 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h}); 2773 ($self->{req_w}, $self->{req_h});
… …
2954 2965
2955sub new { 2966sub new {
2956 my $class = shift; 2967 my $class = shift;
2957 2968
2958 $class->SUPER::new ( 2969 $class->SUPER::new (
2970 visible => 1,
2959 @_, 2971 @_,
2960 ) 2972 )
2961} 2973}
2962 2974
2963sub configure { 2975sub configure {
… …
3021sub add { 3033sub add {
3022 my ($self, @children) = @_; 3034 my ($self, @children) = @_;
3023 3035
3024 for (my @widgets = @children; my $w = pop @widgets; ) { 3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children; 3037 push @widgets, $w->children;
3026 $w->{root} = $self; 3038 $w->{root} = $self;
3027 $w->{visible} = 1; 3039 $w->{visible} = $self->{visible} + 1;
3028 } 3040 }
3029 3041
3030 for my $child (@children) { 3042 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3043 $child->{is_toplevel} = 1;
3032 3044

Diff Legend

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