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.237 by root, Thu May 25 21:36:45 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;
876 $self->add ($self->{slider}); 877 $self->add ($self->{slider});
877 878
878 $self 879 $self
879} 880}
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]);
890}
891
881sub size_allocate { 892sub size_allocate {
882 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
883 894
884 $self->SUPER::size_allocate ($w, $h); 895 $self->SUPER::size_allocate ($w, $h);
885 896
1171sub size_allocate { 1182sub size_allocate {
1172 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1173 1184
1174 my ($ws, $hs) = $self->get_wh; 1185 my ($ws, $hs) = $self->get_wh;
1175 1186
1176 my $req_w = sum @$ws; 1187 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1188 my $req_h = (sum @$hs) || 1;
1178 1189
1179 # TODO: nicer code && do row_expand 1190 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1191 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1192 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1193 my $col_expand = (sum @col_expand) || 1;
2136} 2147}
2137 2148
2138sub set_range { 2149sub set_range {
2139 my ($self, $range) = @_; 2150 my ($self, $range) = @_;
2140 2151
2141 $self->{range} = $range; 2152 ($range, $self->{range}) = ($self->{range}, $range);
2142 2153
2143 $self->update; 2154 $self->update
2155 if "@$range" ne "@{$self->{range}}";
2144} 2156}
2145 2157
2146sub set_value { 2158sub set_value {
2147 my ($self, $value) = @_; 2159 my ($self, $value) = @_;
2148 2160
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753 2765
2754 $row++; 2766 $row++;
2755 } 2767 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758} 2768}
2759 2769
2760sub size_request { 2770sub size_request {
2761 my ($self) = @_; 2771 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h}); 2772 ($self->{req_w}, $self->{req_h});

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines