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.398 by root, Sat Jul 21 14:32:10 2007 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC

… …
646 my ($self) = @_; 646 my ($self) = @_;
647 647
648 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
649} 649}
650 650
651my $cntx;#d#
652sub DESTROY { 651sub DESTROY {
653 my ($self) = @_; 652 my ($self) = @_;
654 653
655 return if CFPlus::in_destruct; 654 return if CFPlus::in_destruct;
656 655
… …
769 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
771 ]; 770 ];
772 771
773 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
774} 775}
775 776
776sub children { 777sub children {
777 @{ $_[0]{children} } 778 @{ $_[0]{children} }
778} 779}
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1094 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1095 $vp->{parent}{vslider}->set_value ($y);
1095 1096
1096 0 1097 0
1097 }, 1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1098 ; 1104 ;
1099 1105
1100 $self->SUPER::add ($self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1101 1107
1102 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
… …
1113sub update_slider { 1119sub update_slider {
1114 my ($self) = @_; 1120 my ($self) = @_;
1115 1121
1116 my $child = ($self->{vp} or return)->child; 1122 my $child = ($self->{vp} or return)->child;
1117 1123
1124 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1127
1121 my $visible = $w1 > $w2; 1128 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1129 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1130 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1131 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1126 } 1134 }
1127 1135
1136 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130 1139
1131 my $visible = $h1 > $h2; 1140 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1141 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible; 1142 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1143 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1136 } 1146 }
1137} 1147}
1138 1148
1139sub start_dragging { 1149sub start_dragging {
1140 my ($self, $ev) = @_; 1150 my ($self, $ev) = @_;
… …
1720 1730
1721use List::Util qw(min max); 1731use List::Util qw(min max);
1722 1732
1723our @ISA = CFPlus::UI::Container::; 1733our @ISA = CFPlus::UI::Container::;
1724 1734
1725sub add { 1735sub add_fixed {
1726 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727 1737
1728 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729 $self->SUPER::add ($child); 1739 $self->SUPER::add ($child);
1730} 1740}
… …
4136 while ($self->{refresh_hook}) { 4146 while ($self->{refresh_hook}) {
4137 $_->() 4147 $_->()
4138 for values %{delete $self->{refresh_hook}}; 4148 for values %{delete $self->{refresh_hook}};
4139 } 4149 }
4140 4150
4141 if ($self->{realloc}) { 4151 while ($self->{realloc}) {
4142 my %queue; 4152 my %queue;
4143 my @queue; 4153 my @queue;
4144 my $widget; 4154 my $widget;
4145 4155
4146 outer: 4156 outer:
… …
4193 } 4203 }
4194 } 4204 }
4195 4205
4196 delete $self->{realloc}{$widget+0}; 4206 delete $self->{realloc}{$widget+0};
4197 } 4207 }
4198 }
4199 4208
4200 while (my $size_alloc = delete $self->{size_alloc}) { 4209 while (my $size_alloc = delete $self->{size_alloc}) {
4201 my @queue = sort { $b->{visible} <=> $a->{visible} } 4210 my @queue = sort { $a->{visible} <=> $b->{visible} }
4202 values %$size_alloc; 4211 values %$size_alloc;
4203 4212
4204 while () { 4213 while () {
4205 my $widget = pop @queue || last; 4214 my $widget = pop @queue || last;
4206 4215
4207 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4216 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4208 4217
4209 $w = 0 if $w < 0;
4210 $h = 0 if $h < 0;
4211
4212 $w = max $widget->{min_w}, $w; 4218 $w = max $widget->{min_w}, $w;
4213 $h = max $widget->{min_h}, $h; 4219 $h = max $widget->{min_h}, $h;
4214 4220
4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4221# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4222# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4217 4223
4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4224 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4225 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4220 4226
4221 $w = int $w + 0.5; 4227 $w = int $w + 0.5;
4222 $h = int $h + 0.5; 4228 $h = int $h + 0.5;
4223 4229
4224 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4230 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4225 $widget->{old_w} = $widget->{w}; 4231 $widget->{old_w} = $widget->{w};
4226 $widget->{old_h} = $widget->{h}; 4232 $widget->{old_h} = $widget->{h};
4227 4233
4228 $widget->{w} = $w; 4234 $widget->{w} = $w;
4229 $widget->{h} = $h; 4235 $widget->{h} = $h;
4230 4236
4231 $widget->emit (size_allocate => $w, $h); 4237 $widget->emit (size_allocate => $w, $h);
4238 }
4232 } 4239 }
4233 } 4240 }
4234 } 4241 }
4235 4242
4236 while ($self->{post_alloc_hook}) { 4243 while ($self->{post_alloc_hook}) {

Diff Legend

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