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.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}
… …
789} 790}
790 791
791sub clear { 792sub clear {
792 my ($self) = @_; 793 my ($self) = @_;
793 794
794 my $children = delete $self->{children}; 795 my $children = $self->{children};
795 $self->{children} = []; 796 $self->{children} = [];
796 797
797 for (@$children) { 798 for (@$children) {
798 delete $_->{parent}; 799 delete $_->{parent};
799 $_->hide; 800 $_->hide;
… …
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;
1103 1109
1104 $self 1110 $self
1105} 1111}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1112
1109sub add { 1113sub add {
1110 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1111 1115
1112 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
… …
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}) {
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}) {
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 }
1146 }
1147}
1148
1149sub start_dragging {
1150 my ($self, $ev) = @_;
1151
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x};
1155 my $oy = $self->{vp}{view_y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1136 } 1164 };
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1165}
1145 1166
1146sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1148 1169
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1172
1155 1 1173 1
1156} 1174}
1157 1175
1158sub invoke_button_down { 1176sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1160 1178
1161 if ($ev->{button} == 2) { 1179 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1180 $self->start_dragging ($ev);
1163
1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1169
1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1173
1174 return 1; 1181 return 1;
1175 } 1182 }
1176 1183
1177 0 1184 0
1178} 1185}
… …
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647 1654
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1655 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1656
1650 if ($w > $sw) { 1657 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; 1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1659 }
1653 } 1660 }
1654 1661
1655 # second pass, rows 1662 # second pass, rows
1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1658 1665
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1667
1661 if ($h > $sh) { 1668 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1670 }
1664 } 1671 }
1665 1672
1666 (\@w, \@h) 1673 (\@w, \@h)
1667} 1674}
… …
1723 1730
1724use List::Util qw(min max); 1731use List::Util qw(min max);
1725 1732
1726our @ISA = CFPlus::UI::Container::; 1733our @ISA = CFPlus::UI::Container::;
1727 1734
1728sub add { 1735sub add_fixed {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_; 1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730 1737
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h]; 1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child); 1739 $self->SUPER::add ($child);
1733} 1740}
… …
4139 while ($self->{refresh_hook}) { 4146 while ($self->{refresh_hook}) {
4140 $_->() 4147 $_->()
4141 for values %{delete $self->{refresh_hook}}; 4148 for values %{delete $self->{refresh_hook}};
4142 } 4149 }
4143 4150
4144 if ($self->{realloc}) { 4151 while ($self->{realloc}) {
4145 my %queue; 4152 my %queue;
4146 my @queue; 4153 my @queue;
4147 my $widget; 4154 my $widget;
4148 4155
4149 outer: 4156 outer:
… …
4196 } 4203 }
4197 } 4204 }
4198 4205
4199 delete $self->{realloc}{$widget+0}; 4206 delete $self->{realloc}{$widget+0};
4200 } 4207 }
4201 }
4202 4208
4203 while (my $size_alloc = delete $self->{size_alloc}) { 4209 while (my $size_alloc = delete $self->{size_alloc}) {
4204 my @queue = sort { $b->{visible} <=> $a->{visible} } 4210 my @queue = sort { $a->{visible} <=> $b->{visible} }
4205 values %$size_alloc; 4211 values %$size_alloc;
4206 4212
4207 while () { 4213 while () {
4208 my $widget = pop @queue || last; 4214 my $widget = pop @queue || last;
4209 4215
4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4216 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4211 4217
4212 $w = 0 if $w < 0;
4213 $h = 0 if $h < 0;
4214
4215 $w = max $widget->{min_w}, $w; 4218 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h; 4219 $h = max $widget->{min_h}, $h;
4217 4220
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4221# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4222# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220 4223
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4224 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4225 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223 4226
4224 $w = int $w + 0.5; 4227 $w = int $w + 0.5;
4225 $h = int $h + 0.5; 4228 $h = int $h + 0.5;
4226 4229
4227 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}) {
4228 $widget->{old_w} = $widget->{w}; 4231 $widget->{old_w} = $widget->{w};
4229 $widget->{old_h} = $widget->{h}; 4232 $widget->{old_h} = $widget->{h};
4230 4233
4231 $widget->{w} = $w; 4234 $widget->{w} = $w;
4232 $widget->{h} = $h; 4235 $widget->{h} = $h;
4233 4236
4234 $widget->emit (size_allocate => $w, $h); 4237 $widget->emit (size_allocate => $w, $h);
4238 }
4235 } 4239 }
4236 } 4240 }
4237 } 4241 }
4238 4242
4239 while ($self->{post_alloc_hook}) { 4243 while ($self->{post_alloc_hook}) {

Diff Legend

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