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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 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
… …
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
224 }, 259 },
225 ); 260 );
226} 261}
227 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)
272}
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 # TODO: req_w _does_change after ->reconfigure 514 $self->set_visible;
515
464 $self->check_size 516 $self->check_size;
465 unless exists $self->{req_w};
466
467 $self->show; 517 $self->show;
468} 518}
469 519
470sub check_size { 520sub check_size {
471 my ($self, $forced) = @_; 521 my ($self, $forced) = @_;
… …
496sub emit { 546sub emit {
497 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
498 548
499 $self->_emit ($signal, @args) 549 $self->_emit ($signal, @args)
500 || $self->$signal (@args); 550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
501} 555}
502 556
503sub DESTROY { 557sub DESTROY {
504 my ($self) = @_; 558 my ($self) = @_;
505 559
… …
853 my $class = shift; 907 my $class = shift;
854 908
855 my $self; 909 my $self;
856 910
857 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
858 vertical => 1, 912 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 914 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 915 $self->{vp}->set_offset (0, $_[1]);
862 }, 916 },
863 ; 917 ;
864 918
865 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
… …
871 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 926 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
874 928
875 $self 929 $self
930}
931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 940}
877 941
878sub size_allocate { 942sub size_allocate {
879 my ($self, $w, $h) = @_; 943 my ($self, $w, $h) = @_;
880 944
… …
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1005
942sub new { 1006sub new {
943 my $class = shift; 1007 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1008
947 my $self = $class->SUPER::new ( 1009 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1010 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1011 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1012 border => 0.6,
… …
1010 my ($ev, $x, $y) = @_; 1072 my ($ev, $x, $y) = @_;
1011 1073
1012 my $dx = $ev->{x} - $ox; 1074 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1075 my $dy = $ev->{y} - $oy;
1014 1076
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1081 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1082 $self->check_size;
1019 }; 1083 };
1020 1084
1021 } elsif ($lr ^ $td) { 1085 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1086 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1025 $self->{motion} = sub { 1089 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1090 my ($ev, $x, $y) = @_;
1027 1091
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1092 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1093
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1094 $self->{user_x} = $bx + $x - $ox;
1095 $self->{user_y} = $by + $y - $oy;
1096
1097 $self->move ($self->{user_x}, $self->{user_y});
1031 $self->update; 1098 $self->update;
1032 }; 1099 };
1033 } 1100 }
1034} 1101}
1035 1102
… …
1168sub size_allocate { 1235sub size_allocate {
1169 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1170 1237
1171 my ($ws, $hs) = $self->get_wh; 1238 my ($ws, $hs) = $self->get_wh;
1172 1239
1173 my $req_w = sum @$ws; 1240 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1241 my $req_h = (sum @$hs) || 1;
1175 1242
1176 # TODO: nicer code && do row_expand 1243 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1244 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1245 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1246 my $col_expand = (sum @col_expand) || 1;
… …
1233 } 1300 }
1234} 1301}
1235 1302
1236############################################################################# 1303#############################################################################
1237 1304
1238package CFClient::UI::HBox; 1305package CFClient::UI::Box;
1239
1240# TODO: wrap into common Box base class
1241 1306
1242our @ISA = CFClient::UI::Container::; 1307our @ISA = CFClient::UI::Container::;
1243 1308
1244sub size_request { 1309sub size_request {
1245 my ($self) = @_; 1310 my ($self) = @_;
1246 1311
1247 my @alloc = map [$_->size_request], @{$self->{children}}; 1312 $self->{vertical}
1248 1313 ? (
1249 ( 1314 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1250 (List::Util::sum map $_->[0], @alloc), 1315 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251 (List::Util::max map $_->[1], @alloc), 1316 )
1252 ) 1317 : (
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 )
1253} 1321}
1254 1322
1255sub size_allocate { 1323sub size_allocate {
1256 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1257 1325
1258 ($h, $w) = ($w, $h); 1326 my $space = $self->{vertical} ? $h : $w;
1259
1260 my $children = $self->{children}; 1327 my $children = $self->{children};
1261 1328
1262 my @h = map $_->{req_w}, @$children; 1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1263
1264 my $req_h = List::Util::sum @h; 1330 my $req = List::Util::sum @req;
1265 1331
1266 if ($req_h > $h) { 1332 if ($req > $space) {
1267 # ah well, not enough space 1333 # ah well, not enough space
1268 $_ *= $h / $req_h for @h; 1334 $_ *= $space / $req for @req;
1269 } else { 1335 } else {
1270 my $exp = List::Util::sum map $_->{expand}, @$children; 1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271 $exp ||= 1;
1272 1337
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1273 for (0 .. $#$children) { 1339 for 0 .. $#$children;
1274 my $child = $children->[$_];
1275
1276 my $alloc_h = $h[$_];
1277 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278 $h[$_] = $alloc_h;
1279 }
1280 } 1340 }
1281 1341
1282 CFClient::UI::harmonize \@h; 1342 CFClient::UI::harmonize \@req;
1283 1343
1284 my $y = 0; 1344 my $pos = 0;
1285 for (0 .. $#$children) { 1345 for (0 .. $#$children) {
1286 my $child = $children->[$_];
1287 my $h = $h[$_]; 1346 my $alloc = $req[$_];
1288 $child->configure ($y, 0, $h, $w); 1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289 1348
1290 $y += $h; 1349 $pos += $alloc;
1291 } 1350 }
1292 1351
1293 1 1352 1
1294} 1353}
1295 1354
1296############################################################################# 1355#############################################################################
1297 1356
1357package CFClient::UI::HBox;
1358
1359our @ISA = CFClient::UI::Box::;
1360
1361sub new {
1362 my $class = shift;
1363
1364 $class->SUPER::new (
1365 vertical => 0,
1366 @_,
1367 )
1368}
1369
1370#############################################################################
1371
1298package CFClient::UI::VBox; 1372package CFClient::UI::VBox;
1299 1373
1300# TODO: wrap into common Box base class
1301
1302our @ISA = CFClient::UI::Container::; 1374our @ISA = CFClient::UI::Box::;
1303 1375
1304sub size_request { 1376sub new {
1305 my ($self) = @_; 1377 my $class = shift;
1306 1378
1307 my @alloc = map [$_->size_request], @{$self->{children}}; 1379 $class->SUPER::new (
1308 1380 vertical => 1,
1309 ( 1381 @_,
1310 (List::Util::max map $_->[0], @alloc),
1311 (List::Util::sum map $_->[1], @alloc),
1312 ) 1382 )
1313}
1314
1315sub size_allocate {
1316 my ($self, $w, $h) = @_;
1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320 my $children = $self->{children};
1321
1322 my @h = map $_->{req_h}, @$children;
1323
1324 my $req_h = List::Util::sum @h;
1325
1326 if ($req_h > $h) {
1327 # ah well, not enough space
1328 $_ *= $h / $req_h for @h;
1329 } else {
1330 my $exp = List::Util::sum map $_->{expand}, @$children;
1331 $exp ||= 1;
1332
1333 for (0 .. $#$children) {
1334 my $child = $children->[$_];
1335
1336 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure (0, $y, $w, $h);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352} 1383}
1353 1384
1354############################################################################# 1385#############################################################################
1355 1386
1356package CFClient::UI::Label; 1387package CFClient::UI::Label;
… …
2133} 2164}
2134 2165
2135sub set_range { 2166sub set_range {
2136 my ($self, $range) = @_; 2167 my ($self, $range) = @_;
2137 2168
2138 $self->{range} = $range; 2169 ($range, $self->{range}) = ($self->{range}, $range);
2139 2170
2140 $self->update; 2171 $self->update
2172 if "@$range" ne "@{$self->{range}}";
2141} 2173}
2142 2174
2143sub set_value { 2175sub set_value {
2144 my ($self, $value) = @_; 2176 my ($self, $value) = @_;
2145 2177
… …
2528 2560
2529sub new { 2561sub new {
2530 my $class = shift; 2562 my $class = shift;
2531 2563
2532 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2533 state => 0, 2565 state => 0,
2534 connect_activate => \&toggle_flopper, 2566 on_activate => \&toggle_flopper,
2535 @_ 2567 @_
2536 ); 2568 );
2537 2569
2538 if ($self->{state}) {
2539 $self->{state} = 0;
2540 $self->toggle_flopper;
2541 }
2542
2543 $self 2570 $self
2544} 2571}
2545 2572
2546sub toggle_flopper { 2573sub toggle_flopper {
2547 my ($self) = @_; 2574 my ($self) = @_;
2548 2575
2549 # TODO: use animation 2576 $self->{other}->toggle_visibility;
2550 if ($self->{state} = !$self->{state}) {
2551 $CFClient::UI::ROOT->add ($self->{other});
2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2553 $self->_emit ("open");
2554 } else {
2555 $CFClient::UI::ROOT->remove ($self->{other});
2556 $self->_emit ("close");
2557 }
2558
2559 $self->_emit (changed => $self->{state});
2560} 2577}
2561 2578
2562############################################################################# 2579#############################################################################
2563 2580
2564package CFClient::UI::Tooltip; 2581package CFClient::UI::Tooltip;
… …
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750 2767
2751 $row++; 2768 $row++;
2752 } 2769 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760} 2770}
2761 2771
2762############################################################################# 2772#############################################################################
2763 2773
2764package CFClient::UI::Menu; 2774package CFClient::UI::Menu;
… …
2951 2961
2952sub new { 2962sub new {
2953 my $class = shift; 2963 my $class = shift;
2954 2964
2955 $class->SUPER::new ( 2965 $class->SUPER::new (
2966 visible => 1,
2956 @_, 2967 @_,
2957 ) 2968 )
2958} 2969}
2959 2970
2960sub configure { 2971sub configure {
… …
2987 if exists $child->{req_x}; 2998 if exists $child->{req_x};
2988 2999
2989 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2990 if exists $child->{req_y}; 3001 if exists $child->{req_y};
2991 3002
3003 delete @$child{qw(req_x req_y)};
3004
2992 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994 3007
2995 $child->configure ($X, $Y, $W, $H); 3008 $child->configure ($X, $Y, $W, $H);
2996 } 3009 }
… …
3015 $::WANT_REFRESH++; 3028 $::WANT_REFRESH++;
3016} 3029}
3017 3030
3018sub add { 3031sub add {
3019 my ($self, @children) = @_; 3032 my ($self, @children) = @_;
3020
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026 3033
3027 for my $child (@children) { 3034 for my $child (@children) {
3028 $child->{is_toplevel} = 1; 3035 $child->{is_toplevel} = 1;
3029 3036
3030 # integerise window positions 3037 # integerise window positions
3031 $child->{x} = int $child->{x}; 3038 $child->{x} = int $child->{x};
3032 $child->{y} = int $child->{y}; 3039 $child->{y} = int $child->{y};
3033 } 3040 }
3034 3041
3035 $self->SUPER::add (@children); 3042 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3036} 3049}
3037 3050
3038sub remove { 3051sub remove {
3039 my ($self, @children) = @_; 3052 my ($self, @children) = @_;
3040 3053
… …
3066 $_->() 3079 $_->()
3067 for values %{delete $self->{refresh_hook}}; 3080 for values %{delete $self->{refresh_hook}};
3068 } 3081 }
3069 3082
3070 if ($self->{check_size}) { 3083 if ($self->{check_size}) {
3071 my @queue = ([], []); 3084 my @queue;
3072 3085
3073 for (;;) { 3086 for (;;) {
3074 if ($self->{check_size}) { 3087 if ($self->{check_size}) {
3075 # heuristic: check containers last 3088 #TODO use array-of-depth approach
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3089
3090 @queue = sort { $a->{visible} <=> $b->{visible} }
3077 for values %{delete $self->{check_size}} 3091 @queue, values %{delete $self->{check_size}};
3078 } 3092 }
3079 3093
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3094 my $widget = pop @queue || last;
3081 3095
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3083 ? @$widget{qw(user_w user_h)} 3099 ? @$widget{qw(def_w def_h)}
3084 : $widget->size_request; 3100 : $widget->size_request;
3085 3101
3086 if (delete $widget->{force_alloc} 3102 if (delete $widget->{force_alloc}
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#

Diff Legend

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