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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %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}
19 38
20sub check_tooltip { 39sub check_tooltip {
21 if (!$GRAB) { 40 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
158 $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};
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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};
163 $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};
164 $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};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 183 }
167 } 184 }
168 185
169 reconfigure_widgets; 186 reconfigure_widgets;
170} 187}
… …
187 can_events => 1, 204 can_events => 1,
188 @_ 205 @_
189 }, $class; 206 }, $class;
190 207
191 for (keys %$self) { 208 for (keys %$self) {
192 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
194 } 211 }
195 } 212 }
196 213
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198 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
199 $self 223 $self
200} 224}
201 225
202sub destroy { 226sub destroy {
203 my ($self) = @_; 227 my ($self) = @_;
… …
206 %$self = (); 230 %$self = ();
207} 231}
208 232
209sub show { 233sub show {
210 my ($self) = @_; 234 my ($self) = @_;
235
211 return if $self->{parent}; 236 return if $self->{parent};
212 237
213 $CFClient::UI::ROOT->add ($self); 238 $CFClient::UI::ROOT->add ($self);
214} 239}
215 240
216sub show_centered { 241sub center {
217 my ($self) = @_; 242 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221 243
222 $CFClient::UI::ROOT->on_post_alloc ( 244 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub { 245 "center_$self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225 }, 247 },
226 ); 248 );
249
250 $self->update;
251}
252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
227} 262}
228 263
229sub set_invisible { 264sub set_invisible {
230 my ($self) = @_; 265 my ($self) = @_;
231 266
267 return unless $self->{visible};
268
232 # broken show/hide model 269 # broken show/hide model
233 270
271 delete $self->{root};
234 delete $self->{visible}; 272 delete $self->{visible};
235 273
236 undef $GRAB if $GRAB == $self; 274 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 275 undef $HOVER if $HOVER == $self;
238 276
239 CFClient::UI::check_tooltip 277 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 278 if $CFClient::UI::TOOLTIP->{owner} == $self;
241 279
242 $self->focus_out; 280 $self->focus_out;
281
282 $self->emit (visibility_change => 0);
283}
284
285sub set_visibility {
286 my ($self, $visible) = @_;
287
288 return if $self->{visible} == $visible;
289
290 $visible ? $self->hide
291 : $self->show;
292}
293
294sub toggle_visibility {
295 my ($self) = @_;
296
297 $self->{visible}
298 ? $self->hide
299 : $self->show;
243} 300}
244 301
245sub hide { 302sub hide {
246 my ($self) = @_; 303 my ($self) = @_;
247 304
… …
262} 319}
263 320
264sub set_size { 321sub set_size {
265 my ($self, $w, $h) = @_; 322 my ($self, $w, $h) = @_;
266 323
267 $self->{user_w} = $w; 324 $self->{def_w} = $w;
268 $self->{user_h} = $h; 325 $self->{def_h} = $h;
269 326
270 $self->check_size; 327 $self->check_size;
271} 328}
272 329
273sub size_request { 330sub size_request {
… …
295 $self->{y} = $y; 352 $self->{y} = $y;
296 $self->update; 353 $self->update;
297 } 354 }
298 355
299 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
301 } 358 }
302} 359}
303 360
304sub size_allocate { 361sub size_allocate {
305 # nothing to be done 362 # nothing to be done
… …
459sub set_parent { 516sub set_parent {
460 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
461 518
462 Scalar::Util::weaken ($self->{parent} = $parent); 519 Scalar::Util::weaken ($self->{parent} = $parent);
463 520
464 $self->{root} = $parent->{root}; 521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
465 $self->{visible} = $parent->{visible};
466 522
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size 523 $self->check_size;
469 unless exists $self->{req_w};
470
471 $self->show;
472} 524}
473 525
474sub check_size { 526sub check_size {
475 my ($self, $forced) = @_; 527 my ($self, $forced) = @_;
476 528
… …
500sub emit { 552sub emit {
501 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
502 554
503 $self->_emit ($signal, @args) 555 $self->_emit ($signal, @args)
504 || $self->$signal (@args); 556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
505} 561}
506 562
507sub DESTROY { 563sub DESTROY {
508 my ($self) = @_; 564 my ($self) = @_;
509 565
… …
785} 841}
786 842
787sub size_request { 843sub size_request {
788 my ($self) = @_; 844 my ($self) = @_;
789 845
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
791 847
792 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
793} 852}
794 853
795sub size_allocate { 854sub size_allocate {
796 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
797 856
… …
857 my $class = shift; 916 my $class = shift;
858 917
859 my $self; 918 my $self;
860 919
861 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
862 vertical => 1, 921 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 923 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
866 }, 925 },
867 ; 926 ;
868 927
869 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1014
956sub new { 1015sub new {
957 my $class = shift; 1016 my $class = shift;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1017
961 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1021 border => 0.6,
… …
1024 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
1025 1082
1026 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
1028 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
1032 $self->check_size; 1091 $self->check_size;
1033 }; 1092 };
1034 1093
1035 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1039 $self->{motion} = sub { 1098 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
1041 1100
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1102
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1045 $self->update; 1107 $self->update;
1046 }; 1108 };
1047 } 1109 }
1048} 1110}
1049 1111
… …
1247 } 1309 }
1248} 1310}
1249 1311
1250############################################################################# 1312#############################################################################
1251 1313
1252package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1315
1256our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1257 1317
1258sub size_request { 1318sub size_request {
1259 my ($self) = @_; 1319 my ($self) = @_;
1260 1320
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1262 1322 ? (
1263 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1325 )
1266 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1267} 1330}
1268 1331
1269sub size_allocate { 1332sub size_allocate {
1270 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1271 1334
1272 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1336 my $children = $self->{children};
1275 1337
1276 my @h = map $_->{req_w}, @$children; 1338 my @req;
1277 1339
1278 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1279 1341 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else { 1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1355 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1356 }
1294 } 1357 }
1295 1358
1296 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1297 1360
1298 my $y = 0; 1361 my $pos = 0;
1299 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1365
1304 $y += $h; 1366 $pos += $alloc;
1305 } 1367 }
1306 1368
1307 1 1369 1
1308} 1370}
1309 1371
1310############################################################################# 1372#############################################################################
1311 1373
1374package CFClient::UI::HBox;
1375
1376our @ISA = CFClient::UI::Box::;
1377
1378sub new {
1379 my $class = shift;
1380
1381 $class->SUPER::new (
1382 vertical => 0,
1383 @_,
1384 )
1385}
1386
1387#############################################################################
1388
1312package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1313 1390
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1317 1392
1318sub size_request { 1393sub new {
1319 my ($self) = @_; 1394 my $class = shift;
1320 1395
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1322 1397 vertical => 1,
1323 ( 1398 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1399 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1400}
1367 1401
1368############################################################################# 1402#############################################################################
1369 1403
1370package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
2543 2577
2544sub new { 2578sub new {
2545 my $class = shift; 2579 my $class = shift;
2546 2580
2547 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2548 state => 0, 2582 state => 0,
2549 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2550 @_ 2584 @_
2551 ); 2585 );
2552 2586
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2587 $self
2559} 2588}
2560 2589
2561sub toggle_flopper { 2590sub toggle_flopper {
2562 my ($self) = @_; 2591 my ($self) = @_;
2563 2592
2564 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2594}
2576 2595
2577############################################################################# 2596#############################################################################
2578 2597
2579package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765 2784
2766 $row++; 2785 $row++;
2767 } 2786 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773} 2787}
2774 2788
2775############################################################################# 2789#############################################################################
2776 2790
2777package CFClient::UI::Menu; 2791package CFClient::UI::Menu;
… …
2964 2978
2965sub new { 2979sub new {
2966 my $class = shift; 2980 my $class = shift;
2967 2981
2968 $class->SUPER::new ( 2982 $class->SUPER::new (
2983 visible => 1,
2969 @_, 2984 @_,
2970 ) 2985 )
2971} 2986}
2972 2987
2973sub configure { 2988sub configure {
… …
3000 if exists $child->{req_x}; 3015 if exists $child->{req_x};
3001 3016
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3003 if exists $child->{req_y}; 3018 if exists $child->{req_y};
3004 3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3024
3008 $child->configure ($X, $Y, $W, $H); 3025 $child->configure ($X, $Y, $W, $H);
3009 } 3026 }
… …
3028 $::WANT_REFRESH++; 3045 $::WANT_REFRESH++;
3029} 3046}
3030 3047
3031sub add { 3048sub add {
3032 my ($self, @children) = @_; 3049 my ($self, @children) = @_;
3033
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039 3050
3040 for my $child (@children) { 3051 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3052 $child->{is_toplevel} = 1;
3042 3053
3043 # integerise window positions 3054 # integerise window positions
3044 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3046 } 3057 }
3047 3058
3048 $self->SUPER::add (@children); 3059 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3049} 3066}
3050 3067
3051sub remove { 3068sub remove {
3052 my ($self, @children) = @_; 3069 my ($self, @children) = @_;
3053 3070
… …
3079 $_->() 3096 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3097 for values %{delete $self->{refresh_hook}};
3081 } 3098 }
3082 3099
3083 if ($self->{check_size}) { 3100 if ($self->{check_size}) {
3084 my @queue = ([], []); 3101 my @queue;
3085 3102
3086 for (;;) { 3103 while () {
3087 if ($self->{check_size}) { 3104 if ($self->{check_size}) {
3088 # heuristic: check containers last 3105 #TODO use array-of-depth approach
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3106
3107 @queue = sort { $a->{visible} <=> $b->{visible} }
3090 for values %{delete $self->{check_size}} 3108 @queue, values %{delete $self->{check_size}};
3091 } 3109 }
3092 3110
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3111 my $widget = pop @queue || last;
3094 3112
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3096 ? @$widget{qw(user_w user_h)} 3116 ? @$widget{qw(def_w def_h)}
3097 : $widget->size_request; 3117 : $widget->size_request;
3098 3118
3099 if (delete $widget->{force_alloc} 3119 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
… …
3109 if $widget->{parent}; 3129 if $widget->{parent};
3110 } 3130 }
3111 } 3131 }
3112 } 3132 }
3113 3133
3114 while ($self->{size_alloc}) { 3134 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3116 my ($widget, $w, $h) = @$_; 3136 values %$size_alloc;
3137
3138 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last };
3117 3140
3118 $w = 0 if $w < 0; 3141 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3142 $h = 0 if $h < 0;
3120 3143
3121 $widget->{w} = $w; 3144 $widget->{w} = $w;

Diff Legend

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