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.392 by root, Sat Jul 21 13:37:09 2007 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

… …
789} 789}
790 790
791sub clear { 791sub clear {
792 my ($self) = @_; 792 my ($self) = @_;
793 793
794 my $children = delete $self->{children}; 794 my $children = $self->{children};
795 $self->{children} = []; 795 $self->{children} = [];
796 796
797 for (@$children) { 797 for (@$children) {
798 delete $_->{parent}; 798 delete $_->{parent};
799 $_->hide; 799 $_->hide;
… …
1102 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1103 1103
1104 $self 1104 $self
1105} 1105}
1106 1106
1107#TODO# update range on size_allocate depending on child?
1108
1109sub add { 1107sub add {
1110 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1111 1109
1112 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1113} 1111}
… …
1119 1117
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1120
1123 my $visible = $w1 > $w2; 1121 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1124 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1125 : $self->SUPER::remove ($self->{hslider});
1127 } 1126 }
1128 1127
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1130
1132 my $visible = $h1 > $h2; 1131 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1135 : $self->SUPER::remove ($self->{vslider});
1136 } 1136 }
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1137}
1145 1138
1146sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1148 1141
… …
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647 1640
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1641 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1642
1650 if ($w > $sw) { 1643 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; 1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1645 }
1653 } 1646 }
1654 1647
1655 # second pass, rows 1648 # second pass, rows
1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1649 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1658 1651
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1653
1661 if ($h > $sh) { 1654 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1656 }
1664 } 1657 }
1665 1658
1666 (\@w, \@h) 1659 (\@w, \@h)
1667} 1660}

Diff Legend

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