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.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.248 by root, Sun May 28 01:37:45 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
165 } 183 }
166 } 184 }
167 185
168 reconfigure_widgets; 186 reconfigure_widgets;
169} 187}
… …
186 can_events => 1, 204 can_events => 1,
187 @_ 205 @_
188 }, $class; 206 }, $class;
189 207
190 for (keys %$self) { 208 for (keys %$self) {
191 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
193 } 211 }
194 } 212 }
195 213
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197 215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
198 $self 223 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
199} 234}
200 235
201sub destroy { 236sub destroy {
202 my ($self) = @_; 237 my ($self) = @_;
203 238
… …
205 %$self = (); 240 %$self = ();
206} 241}
207 242
208sub show { 243sub show {
209 my ($self) = @_; 244 my ($self) = @_;
245
210 return if $self->{parent}; 246 return if $self->{parent};
211 247
212 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
213} 249}
214 250
215sub show_centered { 251sub center {
216 my ($self) = @_; 252 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 253
221 $CFClient::UI::ROOT->on_post_alloc ( 254 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 255 "center_$self" => sub {
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
224 }, 257 },
225 ); 258 );
259
260 $self->update;
261}
262
263sub set_visible {
264 my ($self) = @_;
265
266 return if $self->{visible};
267
268 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1;
270
271 $self->emit (visibility_change => 1);
226} 272}
227 273
228sub set_invisible { 274sub set_invisible {
229 my ($self) = @_; 275 my ($self) = @_;
230 276
277 return unless $self->{visible};
278
231 # broken show/hide model 279 # broken show/hide model
232 280
281 delete $self->{root};
233 delete $self->{visible}; 282 delete $self->{visible};
234 283
235 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
237 286
238 CFClient::UI::check_tooltip 287 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 288 if $CFClient::UI::TOOLTIP->{owner} == $self;
240 289
241 $self->focus_out; 290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
242} 293}
243 294
244sub hide { 295sub hide {
245 my ($self) = @_; 296 my ($self) = @_;
246 297
… …
261} 312}
262 313
263sub set_size { 314sub set_size {
264 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
265 316
266 $self->{user_w} = $w; 317 $self->{def_w} = $w;
267 $self->{user_h} = $h; 318 $self->{def_h} = $h;
268 319
269 $self->check_size; 320 $self->check_size;
270} 321}
271 322
272sub size_request { 323sub size_request {
… …
458sub set_parent { 509sub set_parent {
459 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
460 511
461 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
462 513
463 $self->{root} = $parent->{root}; 514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
464 $self->{visible} = $parent->{visible};
465 515
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size 516 $self->check_size;
468 unless exists $self->{req_w};
469
470 $self->show;
471} 517}
472 518
473sub check_size { 519sub check_size {
474 my ($self, $forced) = @_; 520 my ($self, $forced) = @_;
475 521
… …
499sub emit { 545sub emit {
500 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
501 547
502 $self->_emit ($signal, @args) 548 $self->_emit ($signal, @args)
503 || $self->$signal (@args); 549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
504} 554}
505 555
506sub DESTROY { 556sub DESTROY {
507 my ($self) = @_; 557 my ($self) = @_;
508 558
… …
784} 834}
785 835
786sub size_request { 836sub size_request {
787 my ($self) = @_; 837 my ($self) = @_;
788 838
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
790 840
791 @$self{qw(child_w child_h)} 841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
792} 845}
793 846
794sub size_allocate { 847sub size_allocate {
795 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
796 849
… …
856 my $class = shift; 909 my $class = shift;
857 910
858 my $self; 911 my $self;
859 912
860 my $slider = new CFClient::UI::Slider 913 my $slider = new CFClient::UI::Slider
861 vertical => 1, 914 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 915 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 916 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 917 $self->{vp}->set_offset (0, $_[1]);
865 }, 918 },
866 ; 919 ;
867 920
868 $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
… …
874 $self->{vp}->add ($self->{scrolled}); 927 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp}); 928 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 929 $self->add ($self->{slider});
877 930
878 $self 931 $self
932}
933
934sub update {
935 my ($self) = @_;
936
937 $self->SUPER::update;
938
939 # todo: overwrite size_allocate of child
940 my $child = $self->{vp}->child;
941 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879} 942}
880 943
881sub size_allocate { 944sub size_allocate {
882 my ($self, $w, $h) = @_; 945 my ($self, $w, $h) = @_;
883 946
… …
942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
944 1007
945sub new { 1008sub new {
946 my $class = shift; 1009 my $class = shift;
947
948 # TODO: user_x, user_y, overwrite moveto?
949 1010
950 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
951 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
952 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
953 border => 0.6, 1014 border => 0.6,
… …
1013 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
1014 1075
1015 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
1017 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
1021 $self->check_size; 1084 $self->check_size;
1022 }; 1085 };
1023 1086
1024 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1028 $self->{motion} = sub { 1091 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1030 1093
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1095
1033 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098
1099 $self->move ($self->{user_x}, $self->{user_y});
1034 $self->update; 1100 $self->update;
1035 }; 1101 };
1036 } 1102 }
1037} 1103}
1038 1104
… …
1171sub size_allocate { 1237sub size_allocate {
1172 my ($self, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
1173 1239
1174 my ($ws, $hs) = $self->get_wh; 1240 my ($ws, $hs) = $self->get_wh;
1175 1241
1176 my $req_w = sum @$ws; 1242 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1243 my $req_h = (sum @$hs) || 1;
1178 1244
1179 # TODO: nicer code && do row_expand 1245 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1246 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1247 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1248 my $col_expand = (sum @col_expand) || 1;
… …
1236 } 1302 }
1237} 1303}
1238 1304
1239############################################################################# 1305#############################################################################
1240 1306
1241package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1242
1243# TODO: wrap into common Box base class
1244 1308
1245our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1246 1310
1247sub size_request { 1311sub size_request {
1248 my ($self) = @_; 1312 my ($self) = @_;
1249 1313
1250 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1251 1315 ? (
1252 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1253 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254 (List::Util::max map $_->[1], @alloc), 1318 )
1255 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1256} 1323}
1257 1324
1258sub size_allocate { 1325sub size_allocate {
1259 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1260 1327
1261 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1262
1263 my $children = $self->{children}; 1329 my $children = $self->{children};
1264 1330
1265 my @h = map $_->{req_w}, @$children; 1331 my @req;
1266 1332
1267 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1268 1334 @req = ($space / (@$children || 1)) x @$children;
1269 if ($req_h > $h) {
1270 # ah well, not enough space
1271 $_ *= $h / $req_h for @h;
1272 } else { 1335 } else {
1336 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1337 my $req = List::Util::sum @req;
1338
1339 if ($req > $space) {
1340 # ah well, not enough space
1341 $_ *= $space / $req for @req;
1342 } else {
1273 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274 $exp ||= 1;
1275 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1276 for (0 .. $#$children) { 1348 for 0 .. $#$children;
1277 my $child = $children->[$_];
1278
1279 my $alloc_h = $h[$_];
1280 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281 $h[$_] = $alloc_h;
1282 } 1349 }
1283 } 1350 }
1284 1351
1285 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1286 1353
1287 my $y = 0; 1354 my $pos = 0;
1288 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1289 my $child = $children->[$_];
1290 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1291 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292 1358
1293 $y += $h; 1359 $pos += $alloc;
1294 } 1360 }
1295 1361
1296 1 1362 1
1297} 1363}
1298 1364
1299############################################################################# 1365#############################################################################
1300 1366
1367package CFClient::UI::HBox;
1368
1369our @ISA = CFClient::UI::Box::;
1370
1371sub new {
1372 my $class = shift;
1373
1374 $class->SUPER::new (
1375 vertical => 0,
1376 @_,
1377 )
1378}
1379
1380#############################################################################
1381
1301package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1302 1383
1303# TODO: wrap into common Box base class
1304
1305our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1306 1385
1307sub size_request { 1386sub new {
1308 my ($self) = @_; 1387 my $class = shift;
1309 1388
1310 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1311 1390 vertical => 1,
1312 ( 1391 @_,
1313 (List::Util::max map $_->[0], @alloc),
1314 (List::Util::sum map $_->[1], @alloc),
1315 ) 1392 )
1316}
1317
1318sub size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323 my $children = $self->{children};
1324
1325 my @h = map $_->{req_h}, @$children;
1326
1327 my $req_h = List::Util::sum @h;
1328
1329 if ($req_h > $h) {
1330 # ah well, not enough space
1331 $_ *= $h / $req_h for @h;
1332 } else {
1333 my $exp = List::Util::sum map $_->{expand}, @$children;
1334 $exp ||= 1;
1335
1336 for (0 .. $#$children) {
1337 my $child = $children->[$_];
1338
1339 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340 }
1341 }
1342
1343 CFClient::UI::harmonize \@h;
1344
1345 my $y = 0;
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348 my $h = $h[$_];
1349 $child->configure (0, $y, $w, $h);
1350
1351 $y += $h;
1352 }
1353
1354 1
1355} 1393}
1356 1394
1357############################################################################# 1395#############################################################################
1358 1396
1359package CFClient::UI::Label; 1397package CFClient::UI::Label;
… …
2136} 2174}
2137 2175
2138sub set_range { 2176sub set_range {
2139 my ($self, $range) = @_; 2177 my ($self, $range) = @_;
2140 2178
2141 $self->{range} = $range; 2179 ($range, $self->{range}) = ($self->{range}, $range);
2142 2180
2143 $self->update; 2181 $self->update
2182 if "@$range" ne "@{$self->{range}}";
2144} 2183}
2145 2184
2146sub set_value { 2185sub set_value {
2147 my ($self, $value) = @_; 2186 my ($self, $value) = @_;
2148 2187
… …
2531 2570
2532sub new { 2571sub new {
2533 my $class = shift; 2572 my $class = shift;
2534 2573
2535 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2536 state => 0, 2575 state => 0,
2537 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2538 @_ 2577 @_
2539 ); 2578 );
2540 2579
2541 if ($self->{state}) {
2542 $self->{state} = 0;
2543 $self->toggle_flopper;
2544 }
2545
2546 $self 2580 $self
2547} 2581}
2548 2582
2549sub toggle_flopper { 2583sub toggle_flopper {
2550 my ($self) = @_; 2584 my ($self) = @_;
2551 2585
2552 # TODO: use animation 2586 $self->{other}->toggle_visibility;
2553 if ($self->{state} = !$self->{state}) {
2554 $CFClient::UI::ROOT->add ($self->{other});
2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2556 $self->_emit ("open");
2557 } else {
2558 $CFClient::UI::ROOT->remove ($self->{other});
2559 $self->_emit ("close");
2560 }
2561
2562 $self->_emit (changed => $self->{state});
2563} 2587}
2564 2588
2565############################################################################# 2589#############################################################################
2566 2590
2567package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753 2777
2754 $row++; 2778 $row++;
2755 } 2779 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h});
2763} 2780}
2764 2781
2765############################################################################# 2782#############################################################################
2766 2783
2767package CFClient::UI::Menu; 2784package CFClient::UI::Menu;
… …
2954 2971
2955sub new { 2972sub new {
2956 my $class = shift; 2973 my $class = shift;
2957 2974
2958 $class->SUPER::new ( 2975 $class->SUPER::new (
2976 visible => 1,
2959 @_, 2977 @_,
2960 ) 2978 )
2961} 2979}
2962 2980
2963sub configure { 2981sub configure {
… …
2990 if exists $child->{req_x}; 3008 if exists $child->{req_x};
2991 3009
2992 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2993 if exists $child->{req_y}; 3011 if exists $child->{req_y};
2994 3012
3013 delete @$child{qw(req_x req_y)};
3014
2995 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997 3017
2998 $child->configure ($X, $Y, $W, $H); 3018 $child->configure ($X, $Y, $W, $H);
2999 } 3019 }
… …
3018 $::WANT_REFRESH++; 3038 $::WANT_REFRESH++;
3019} 3039}
3020 3040
3021sub add { 3041sub add {
3022 my ($self, @children) = @_; 3042 my ($self, @children) = @_;
3023
3024 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children;
3026 $w->{root} = $self;
3027 $w->{visible} = 1;
3028 }
3029 3043
3030 for my $child (@children) { 3044 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3045 $child->{is_toplevel} = 1;
3032 3046
3033 # integerise window positions 3047 # integerise window positions
3034 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
3035 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3036 } 3050 }
3037 3051
3038 $self->SUPER::add (@children); 3052 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3039} 3059}
3040 3060
3041sub remove { 3061sub remove {
3042 my ($self, @children) = @_; 3062 my ($self, @children) = @_;
3043 3063
… …
3069 $_->() 3089 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3090 for values %{delete $self->{refresh_hook}};
3071 } 3091 }
3072 3092
3073 if ($self->{check_size}) { 3093 if ($self->{check_size}) {
3074 my @queue = ([], []); 3094 my @queue;
3075 3095
3076 for (;;) { 3096 for (;;) {
3077 if ($self->{check_size}) { 3097 if ($self->{check_size}) {
3078 # heuristic: check containers last 3098 #TODO use array-of-depth approach
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
3080 for values %{delete $self->{check_size}} 3101 @queue, values %{delete $self->{check_size}};
3081 } 3102 }
3082 3103
3083 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3104 my $widget = pop @queue || last;
3084 3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3086 ? @$widget{qw(user_w user_h)} 3109 ? @$widget{qw(def_w def_h)}
3087 : $widget->size_request; 3110 : $widget->size_request;
3088 3111
3089 if (delete $widget->{force_alloc} 3112 if (delete $widget->{force_alloc}
3090 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#

Diff Legend

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