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.400 by root, Sat Jul 21 16:15:03 2007 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

… …
1094 $vp->{parent}{hslider}->set_value ($x); 1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y); 1095 $vp->{parent}{vslider}->set_value ($y);
1096 1096
1097 0 1097 0
1098 }, 1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1099 ; 1104 ;
1100 1105
1101 $self->SUPER::add ($self->{vp}); 1106 $self->SUPER::add ($self->{vp});
1102 1107
1103 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
… …
1114sub update_slider { 1119sub update_slider {
1115 my ($self) = @_; 1120 my ($self) = @_;
1116 1121
1117 my $child = ($self->{vp} or return)->child; 1122 my $child = ($self->{vp} or return)->child;
1118 1123
1124 if ($self->{scroll_x}) {
1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1120 $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]);
1121 1127
1122 my $visible = $w1 > $w2; 1128 my $visible = $w1 > $w2;
1123 if ($visible != $self->{hslider_visible}) { 1129 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible; 1130 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1131 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1127 } 1134 }
1128 1135
1136 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $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]);
1131 1139
1132 my $visible = $h1 > $h2; 1140 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) { 1141 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible; 1142 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider}) 1143 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider}); 1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1137 } 1146 }
1138} 1147}
1139 1148
1140sub start_dragging { 1149sub start_dragging {
1141 my ($self, $ev) = @_; 1150 my ($self, $ev) = @_;
… …
1721 1730
1722use List::Util qw(min max); 1731use List::Util qw(min max);
1723 1732
1724our @ISA = CFPlus::UI::Container::; 1733our @ISA = CFPlus::UI::Container::;
1725 1734
1726sub add { 1735sub add_fixed {
1727 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1728 1737
1729 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1730 $self->SUPER::add ($child); 1739 $self->SUPER::add ($child);
1731} 1740}
… …
1786 for my $child ($self->visible_children) { 1795 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788 1797
1789 $x = _scale $pos, $x, $W; 1798 $x = _scale $pos, $x, $W;
1790 $y = _scale $pos, $x, $H; 1799 $y = _scale $pos, $x, $H;
1791 $w = _scale $size, $w, $child->{req_w}; 1800 $w = _scale $size, $w, $W;
1792 $h = _scale $size, $h, $child->{req_h}; 1801 $h = _scale $size, $h, $H;
1793 1802
1794 $child->configure ($x, $y, $w, $h); 1803 $child->configure ($x, $y, $w, $h);
1795 } 1804 }
1796 1805
1797 1 1806 1
… …
3521 3530
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) { 3532 if ($anim && @$anim) {
3524 delete $self->{wait_face}; 3533 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3526 } 3536 }
3527 } 3537 }
3528} 3538}
3529 3539
3530sub size_request { 3540sub size_request {
3531 my ($self) = @_; 3541 my ($self) = @_;
3532 3542
3533 if ($::CONN) { 3543 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) { 3545 if (my $tex = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex;
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else { 3548 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc; 3550 $self->realloc;
3540 }); 3551 });
… …
3562} 3573}
3563 3574
3564sub _draw { 3575sub _draw {
3565 my ($self) = @_; 3576 my ($self) = @_;
3566 3577
3567 return unless $::CONN;
3568
3569 $self->SUPER::_draw; 3578 $self->SUPER::_draw;
3570 3579
3571 my $faceid = $::CONN->{faceid}[$self->{face}] 3580 if (my $tex = $self->{tex}) {
3572 or return;
3573
3574 my $tex = $::CONN->{texture}[$faceid];
3575
3576 if ($tex) {
3577 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3579 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
3580 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3581 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
… …
4137 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
4138 $_->() 4142 $_->()
4139 for values %{delete $self->{refresh_hook}}; 4143 for values %{delete $self->{refresh_hook}};
4140 } 4144 }
4141 4145
4142 if ($self->{realloc}) { 4146 while ($self->{realloc}) {
4143 my %queue; 4147 my %queue;
4144 my @queue; 4148 my @queue;
4145 my $widget; 4149 my $widget;
4146 4150
4147 outer: 4151 outer:
… …
4194 } 4198 }
4195 } 4199 }
4196 4200
4197 delete $self->{realloc}{$widget+0}; 4201 delete $self->{realloc}{$widget+0};
4198 } 4202 }
4199 }
4200 4203
4201 while (my $size_alloc = delete $self->{size_alloc}) { 4204 while (my $size_alloc = delete $self->{size_alloc}) {
4202 my @queue = sort { $b->{visible} <=> $a->{visible} } 4205 my @queue = sort { $a->{visible} <=> $b->{visible} }
4203 values %$size_alloc; 4206 values %$size_alloc;
4204 4207
4205 while () { 4208 while () {
4206 my $widget = pop @queue || last; 4209 my $widget = pop @queue || last;
4207 4210
4208 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4211 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4209 4212
4210 $w = 0 if $w < 0;
4211 $h = 0 if $h < 0;
4212
4213 $w = max $widget->{min_w}, $w; 4213 $w = max $widget->{min_w}, $w;
4214 $h = max $widget->{min_h}, $h; 4214 $h = max $widget->{min_h}, $h;
4215 4215
4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4218 4218
4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4221 4221
4222 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
4223 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
4224 4224
4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4226 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
4227 $widget->{old_h} = $widget->{h}; 4227 $widget->{old_h} = $widget->{h};
4228 4228
4229 $widget->{w} = $w; 4229 $widget->{w} = $w;
4230 $widget->{h} = $h; 4230 $widget->{h} = $h;
4231 4231
4232 $widget->emit (size_allocate => $w, $h); 4232 $widget->emit (size_allocate => $w, $h);
4233 }
4233 } 4234 }
4234 } 4235 }
4235 } 4236 }
4236 4237
4237 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {

Diff Legend

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