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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.240 by root, Fri May 26 18:28:23 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;
… …
458sub set_parent { 459sub set_parent {
459 my ($self, $parent) = @_; 460 my ($self, $parent) = @_;
460 461
461 Scalar::Util::weaken ($self->{parent} = $parent); 462 Scalar::Util::weaken ($self->{parent} = $parent);
462 463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
463 # TODO: req_w _does_change after ->reconfigure 467 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size 468 $self->check_size
465 unless exists $self->{req_w}; 469 unless exists $self->{req_w};
466 470
467 $self->show; 471 $self->show;
… …
871 $self->{vp}->add ($self->{scrolled}); 875 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 876 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 877 $self->add ($self->{slider});
874 878
875 $self 879 $self
880}
881
882sub update {
883 my ($self) = @_;
884
885 $self->SUPER::update;
886
887 # todo: overwrite size_allocate of child
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 890}
877 891
878sub size_allocate { 892sub size_allocate {
879 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
880 894
… …
1168sub size_allocate { 1182sub size_allocate {
1169 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1170 1184
1171 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1172 1186
1173 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1175 1189
1176 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
… …
2133} 2147}
2134 2148
2135sub set_range { 2149sub set_range {
2136 my ($self, $range) = @_; 2150 my ($self, $range) = @_;
2137 2151
2138 $self->{range} = $range; 2152 ($range, $self->{range}) = ($self->{range}, $range);
2139 2153
2140 $self->update; 2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2141} 2156}
2142 2157
2143sub set_value { 2158sub set_value {
2144 my ($self, $value) = @_; 2159 my ($self, $value) = @_;
2145 2160
… …
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750 2765
2751 $row++; 2766 $row++;
2752 } 2767 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755} 2768}
2756 2769
2757sub size_request { 2770sub size_request {
2758 my ($self) = @_; 2771 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h}); 2772 ($self->{req_w}, $self->{req_h});

Diff Legend

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