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

Diff Legend

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