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.249 by root, Sun May 28 01:40:02 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
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
200} 234}
201 235
202sub destroy { 236sub destroy {
203 my ($self) = @_; 237 my ($self) = @_;
204 238
… …
206 %$self = (); 240 %$self = ();
207} 241}
208 242
209sub show { 243sub show {
210 my ($self) = @_; 244 my ($self) = @_;
245
211 return if $self->{parent}; 246 return if $self->{parent};
212 247
213 $CFClient::UI::ROOT->add ($self); 248 $CFClient::UI::ROOT->add ($self);
214} 249}
215 250
216sub show_centered { 251sub center {
217 my ($self) = @_; 252 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221 253
222 $CFClient::UI::ROOT->on_post_alloc ( 254 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub { 255 "center_$self" => sub {
224 $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);
225 }, 257 },
226 ); 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);
227} 272}
228 273
229sub set_invisible { 274sub set_invisible {
230 my ($self) = @_; 275 my ($self) = @_;
231 276
277 return unless $self->{visible};
278
232 # broken show/hide model 279 # broken show/hide model
233 280
281 delete $self->{root};
234 delete $self->{visible}; 282 delete $self->{visible};
235 283
236 undef $GRAB if $GRAB == $self; 284 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 285 undef $HOVER if $HOVER == $self;
238 286
239 CFClient::UI::check_tooltip 287 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 288 if $CFClient::UI::TOOLTIP->{owner} == $self;
241 289
242 $self->focus_out; 290 $self->focus_out;
291
292 $self->emit (visibility_change => 0);
243} 293}
244 294
245sub hide { 295sub hide {
246 my ($self) = @_; 296 my ($self) = @_;
247 297
… …
262} 312}
263 313
264sub set_size { 314sub set_size {
265 my ($self, $w, $h) = @_; 315 my ($self, $w, $h) = @_;
266 316
267 $self->{user_w} = $w; 317 $self->{def_w} = $w;
268 $self->{user_h} = $h; 318 $self->{def_h} = $h;
269 319
270 $self->check_size; 320 $self->check_size;
271} 321}
272 322
273sub size_request { 323sub size_request {
… …
459sub set_parent { 509sub set_parent {
460 my ($self, $parent) = @_; 510 my ($self, $parent) = @_;
461 511
462 Scalar::Util::weaken ($self->{parent} = $parent); 512 Scalar::Util::weaken ($self->{parent} = $parent);
463 513
464 $self->{root} = $parent->{root}; 514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
465 $self->{visible} = $parent->{visible};
466 515
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size 516 $self->check_size;
469 unless exists $self->{req_w};
470
471 $self->show;
472} 517}
473 518
474sub check_size { 519sub check_size {
475 my ($self, $forced) = @_; 520 my ($self, $forced) = @_;
476 521
… …
500sub emit { 545sub emit {
501 my ($self, $signal, @args) = @_; 546 my ($self, $signal, @args) = @_;
502 547
503 $self->_emit ($signal, @args) 548 $self->_emit ($signal, @args)
504 || $self->$signal (@args); 549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
505} 554}
506 555
507sub DESTROY { 556sub DESTROY {
508 my ($self) = @_; 557 my ($self) = @_;
509 558
… …
785} 834}
786 835
787sub size_request { 836sub size_request {
788 my ($self) = @_; 837 my ($self) = @_;
789 838
790 @$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)};
791 840
792 @$self{qw(child_w child_h)} 841 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y};
843
844 ($w, $h)
793} 845}
794 846
795sub size_allocate { 847sub size_allocate {
796 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
797 849
… …
857 my $class = shift; 909 my $class = shift;
858 910
859 my $self; 911 my $self;
860 912
861 my $slider = new CFClient::UI::Slider 913 my $slider = new CFClient::UI::Slider
862 vertical => 1, 914 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 915 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 916 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 917 $self->{vp}->set_offset (0, $_[1]);
866 }, 918 },
867 ; 919 ;
868 920
869 $self = $class->SUPER::new ( 921 $self = $class->SUPER::new (
… …
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1005 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); 1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1007
956sub new { 1008sub new {
957 my $class = shift; 1009 my $class = shift;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1010
961 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1014 border => 0.6,
… …
1024 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
1025 1075
1026 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
1028 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
1032 $self->check_size; 1084 $self->check_size;
1033 }; 1085 };
1034 1086
1035 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1039 $self->{motion} = sub { 1091 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1041 1093
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1095
1044 $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});
1045 $self->update; 1100 $self->update;
1046 }; 1101 };
1047 } 1102 }
1048} 1103}
1049 1104
… …
1247 } 1302 }
1248} 1303}
1249 1304
1250############################################################################# 1305#############################################################################
1251 1306
1252package CFClient::UI::HBox; 1307package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1308
1256our @ISA = CFClient::UI::Container::; 1309our @ISA = CFClient::UI::Container::;
1257 1310
1258sub size_request { 1311sub size_request {
1259 my ($self) = @_; 1312 my ($self) = @_;
1260 1313
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1314 $self->{vertical}
1262 1315 ? (
1263 ( 1316 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1317 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1318 )
1266 ) 1319 : (
1320 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1321 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1322 )
1267} 1323}
1268 1324
1269sub size_allocate { 1325sub size_allocate {
1270 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1271 1327
1272 ($h, $w) = ($w, $h); 1328 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1329 my $children = $self->{children};
1275 1330
1276 my @h = map $_->{req_w}, @$children; 1331 my @req;
1277 1332
1278 my $req_h = List::Util::sum @h; 1333 if ($self->{homogeneous}) {
1279 1334 @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 { 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 {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1343 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1344
1345 $space = ($space - $req) / $expand; # remaining space to give away
1346
1347 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1348 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 } 1349 }
1294 } 1350 }
1295 1351
1296 CFClient::UI::harmonize \@h; 1352 CFClient::UI::harmonize \@req;
1297 1353
1298 my $y = 0; 1354 my $pos = 0;
1299 for (0 .. $#$children) { 1355 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1356 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1357 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1358
1304 $y += $h; 1359 $pos += $alloc;
1305 } 1360 }
1306 1361
1307 1 1362 1
1308} 1363}
1309 1364
1310############################################################################# 1365#############################################################################
1311 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
1312package CFClient::UI::VBox; 1382package CFClient::UI::VBox;
1313 1383
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
1317 1385
1318sub size_request { 1386sub new {
1319 my ($self) = @_; 1387 my $class = shift;
1320 1388
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
1322 1390 vertical => 1,
1323 ( 1391 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1392 )
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} 1393}
1367 1394
1368############################################################################# 1395#############################################################################
1369 1396
1370package CFClient::UI::Label; 1397package CFClient::UI::Label;
… …
2543 2570
2544sub new { 2571sub new {
2545 my $class = shift; 2572 my $class = shift;
2546 2573
2547 my $self = $class->SUPER::new ( 2574 my $self = $class->SUPER::new (
2548 state => 0, 2575 state => 0,
2549 connect_activate => \&toggle_flopper, 2576 on_activate => \&toggle_flopper,
2550 @_ 2577 @_
2551 ); 2578 );
2552 2579
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2580 $self
2559} 2581}
2560 2582
2561sub toggle_flopper { 2583sub toggle_flopper {
2562 my ($self) = @_; 2584 my ($self) = @_;
2563 2585
2564 # TODO: use animation 2586 $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} 2587}
2576 2588
2577############################################################################# 2589#############################################################################
2578 2590
2579package CFClient::UI::Tooltip; 2591package CFClient::UI::Tooltip;
… …
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765 2777
2766 $row++; 2778 $row++;
2767 } 2779 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773} 2780}
2774 2781
2775############################################################################# 2782#############################################################################
2776 2783
2777package CFClient::UI::Menu; 2784package CFClient::UI::Menu;
… …
2964 2971
2965sub new { 2972sub new {
2966 my $class = shift; 2973 my $class = shift;
2967 2974
2968 $class->SUPER::new ( 2975 $class->SUPER::new (
2976 visible => 1,
2969 @_, 2977 @_,
2970 ) 2978 )
2971} 2979}
2972 2980
2973sub configure { 2981sub configure {
… …
3000 if exists $child->{req_x}; 3008 if exists $child->{req_x};
3001 3009
3002 $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
3003 if exists $child->{req_y}; 3011 if exists $child->{req_y};
3004 3012
3013 delete @$child{qw(req_x req_y)};
3014
3005 $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;
3006 $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;
3007 3017
3008 $child->configure ($X, $Y, $W, $H); 3018 $child->configure ($X, $Y, $W, $H);
3009 } 3019 }
… …
3028 $::WANT_REFRESH++; 3038 $::WANT_REFRESH++;
3029} 3039}
3030 3040
3031sub add { 3041sub add {
3032 my ($self, @children) = @_; 3042 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 3043
3040 for my $child (@children) { 3044 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3045 $child->{is_toplevel} = 1;
3042 3046
3043 # integerise window positions 3047 # integerise window positions
3044 $child->{x} = int $child->{x}; 3048 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y}; 3049 $child->{y} = int $child->{y};
3046 } 3050 }
3047 3051
3048 $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
3049} 3059}
3050 3060
3051sub remove { 3061sub remove {
3052 my ($self, @children) = @_; 3062 my ($self, @children) = @_;
3053 3063
… …
3079 $_->() 3089 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3090 for values %{delete $self->{refresh_hook}};
3081 } 3091 }
3082 3092
3083 if ($self->{check_size}) { 3093 if ($self->{check_size}) {
3084 my @queue = ([], []); 3094 my @queue;
3085 3095
3086 for (;;) { 3096 for (;;) {
3087 if ($self->{check_size}) { 3097 if ($self->{check_size}) {
3088 # heuristic: check containers last 3098 #TODO use array-of-depth approach
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3099
3100 @queue = sort { $a->{visible} <=> $b->{visible} }
3090 for values %{delete $self->{check_size}} 3101 @queue, values %{delete $self->{check_size}};
3091 } 3102 }
3092 3103
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3104 my $widget = pop @queue || last;
3094 3105
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3096 ? @$widget{qw(user_w user_h)} 3109 ? @$widget{qw(def_w def_h)}
3097 : $widget->size_request; 3110 : $widget->size_request;
3098 3111
3099 if (delete $widget->{force_alloc} 3112 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 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#
… …
3110 } 3123 }
3111 } 3124 }
3112 } 3125 }
3113 3126
3114 while ($self->{size_alloc}) { 3127 while ($self->{size_alloc}) {
3128 for (
3129 sort { $a->[0]{visible} <=> $b->[0]{visible} }
3115 for (values %{delete $self->{size_alloc}}) { 3130 values %{delete $self->{size_alloc}}
3131 ) {
3116 my ($widget, $w, $h) = @$_; 3132 my ($widget, $w, $h) = @$_;
3117 3133
3118 $w = 0 if $w < 0; 3134 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3135 $h = 0 if $h < 0;
3120 3136

Diff Legend

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