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.241 by root, Fri May 26 20:50:35 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) = @_;
266
267 return unless $self->{visible};
231 268
232 # broken show/hide model 269 # broken show/hide model
233 270
234 delete $self->{root}; 271 delete $self->{root};
235 delete $self->{visible}; 272 delete $self->{visible};
… …
239 276
240 CFClient::UI::check_tooltip 277 CFClient::UI::check_tooltip
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 278 if $CFClient::UI::TOOLTIP->{owner} == $self;
242 279
243 $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;
244} 300}
245 301
246sub hide { 302sub hide {
247 my ($self) = @_; 303 my ($self) = @_;
248 304
… …
263} 319}
264 320
265sub set_size { 321sub set_size {
266 my ($self, $w, $h) = @_; 322 my ($self, $w, $h) = @_;
267 323
268 $self->{user_w} = $w; 324 $self->{def_w} = $w;
269 $self->{user_h} = $h; 325 $self->{def_h} = $h;
270 326
271 $self->check_size; 327 $self->check_size;
272} 328}
273 329
274sub size_request { 330sub size_request {
… …
296 $self->{y} = $y; 352 $self->{y} = $y;
297 $self->update; 353 $self->update;
298 } 354 }
299 355
300 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
301 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
302 } 358 }
303} 359}
304 360
305sub size_allocate { 361sub size_allocate {
306 # nothing to be done 362 # nothing to be done
… …
460sub set_parent { 516sub set_parent {
461 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
462 518
463 Scalar::Util::weaken ($self->{parent} = $parent); 519 Scalar::Util::weaken ($self->{parent} = $parent);
464 520
465 $self->{root} = $parent->{root}; 521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
466 $self->{visible} = $parent->{visible} + 1;
467 522
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size 523 $self->check_size;
470 unless exists $self->{req_w};
471
472 $self->show;
473} 524}
474 525
475sub check_size { 526sub check_size {
476 my ($self, $forced) = @_; 527 my ($self, $forced) = @_;
477 528
… …
501sub emit { 552sub emit {
502 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
503 554
504 $self->_emit ($signal, @args) 555 $self->_emit ($signal, @args)
505 || $self->$signal (@args); 556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
506} 561}
507 562
508sub DESTROY { 563sub DESTROY {
509 my ($self) = @_; 564 my ($self) = @_;
510 565
… …
786} 841}
787 842
788sub size_request { 843sub size_request {
789 my ($self) = @_; 844 my ($self) = @_;
790 845
791 @$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)};
792 847
793 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
794} 852}
795 853
796sub size_allocate { 854sub size_allocate {
797 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
798 856
… …
858 my $class = shift; 916 my $class = shift;
859 917
860 my $self; 918 my $self;
861 919
862 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
863 vertical => 1, 921 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 923 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
867 }, 925 },
868 ; 926 ;
869 927
870 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 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);
956 1014
957sub new { 1015sub new {
958 my $class = shift; 1016 my $class = shift;
959
960 # TODO: user_x, user_y, overwrite moveto?
961 1017
962 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1021 border => 0.6,
… …
1025 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
1026 1082
1027 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
1029 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
1033 $self->check_size; 1091 $self->check_size;
1034 }; 1092 };
1035 1093
1036 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1040 $self->{motion} = sub { 1098 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
1042 1100
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1102
1045 $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});
1046 $self->update; 1107 $self->update;
1047 }; 1108 };
1048 } 1109 }
1049} 1110}
1050 1111
… …
1248 } 1309 }
1249} 1310}
1250 1311
1251############################################################################# 1312#############################################################################
1252 1313
1253package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1315
1257our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1258 1317
1259sub size_request { 1318sub size_request {
1260 my ($self) = @_; 1319 my ($self) = @_;
1261 1320
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1263 1322 ? (
1264 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1325 )
1267 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1268} 1330}
1269 1331
1270sub size_allocate { 1332sub size_allocate {
1271 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1272 1334
1273 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1336 my $children = $self->{children};
1276 1337
1277 my @h = map $_->{req_w}, @$children; 1338 my @req;
1278 1339
1279 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1280 1341 @req = ($space / (@$children || 1)) x @$children;
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } 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 {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1288 for (0 .. $#$children) { 1355 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 } 1356 }
1295 } 1357 }
1296 1358
1297 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1298 1360
1299 my $y = 0; 1361 my $pos = 0;
1300 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1365
1305 $y += $h; 1366 $pos += $alloc;
1306 } 1367 }
1307 1368
1308 1 1369 1
1309} 1370}
1310 1371
1311############################################################################# 1372#############################################################################
1312 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
1313package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1314 1390
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1318 1392
1319sub size_request { 1393sub new {
1320 my ($self) = @_; 1394 my $class = shift;
1321 1395
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1323 1397 vertical => 1,
1324 ( 1398 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1399 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1400}
1368 1401
1369############################################################################# 1402#############################################################################
1370 1403
1371package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
2544 2577
2545sub new { 2578sub new {
2546 my $class = shift; 2579 my $class = shift;
2547 2580
2548 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2549 state => 0, 2582 state => 0,
2550 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2551 @_ 2584 @_
2552 ); 2585 );
2553 2586
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2587 $self
2560} 2588}
2561 2589
2562sub toggle_flopper { 2590sub toggle_flopper {
2563 my ($self) = @_; 2591 my ($self) = @_;
2564 2592
2565 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2594}
2577 2595
2578############################################################################# 2596#############################################################################
2579 2597
2580package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766 2784
2767 $row++; 2785 $row++;
2768 } 2786 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774} 2787}
2775 2788
2776############################################################################# 2789#############################################################################
2777 2790
2778package CFClient::UI::Menu; 2791package CFClient::UI::Menu;
… …
3002 if exists $child->{req_x}; 3015 if exists $child->{req_x};
3003 3016
3004 $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
3005 if exists $child->{req_y}; 3018 if exists $child->{req_y};
3006 3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3007 $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;
3008 $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;
3009 3024
3010 $child->configure ($X, $Y, $W, $H); 3025 $child->configure ($X, $Y, $W, $H);
3011 } 3026 }
… …
3030 $::WANT_REFRESH++; 3045 $::WANT_REFRESH++;
3031} 3046}
3032 3047
3033sub add { 3048sub add {
3034 my ($self, @children) = @_; 3049 my ($self, @children) = @_;
3035
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041 3050
3042 for my $child (@children) { 3051 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3052 $child->{is_toplevel} = 1;
3044 3053
3045 # integerise window positions 3054 # integerise window positions
3046 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3048 } 3057 }
3049 3058
3050 $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
3051} 3066}
3052 3067
3053sub remove { 3068sub remove {
3054 my ($self, @children) = @_; 3069 my ($self, @children) = @_;
3055 3070
… …
3081 $_->() 3096 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3097 for values %{delete $self->{refresh_hook}};
3083 } 3098 }
3084 3099
3085 if ($self->{check_size}) { 3100 if ($self->{check_size}) {
3086 my @queue = ([], []); 3101 my @queue;
3087 3102
3088 for (;;) { 3103 while () {
3089 if ($self->{check_size}) { 3104 if ($self->{check_size}) {
3090 # heuristic: check containers last 3105 #TODO use array-of-depth approach
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3106
3107 @queue = sort { $a->{visible} <=> $b->{visible} }
3092 for values %{delete $self->{check_size}} 3108 @queue, values %{delete $self->{check_size}};
3093 } 3109 }
3094 3110
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3111 my $widget = pop @queue || last;
3096 3112
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3098 ? @$widget{qw(user_w user_h)} 3116 ? @$widget{qw(def_w def_h)}
3099 : $widget->size_request; 3117 : $widget->size_request;
3100 3118
3101 if (delete $widget->{force_alloc} 3119 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 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#
… …
3111 if $widget->{parent}; 3129 if $widget->{parent};
3112 } 3130 }
3113 } 3131 }
3114 } 3132 }
3115 3133
3116 while ($self->{size_alloc}) { 3134 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3118 my ($widget, $w, $h) = @$_; 3136 values %$size_alloc;
3137
3138 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last };
3119 3140
3120 $w = 0 if $w < 0; 3141 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3142 $h = 0 if $h < 0;
3122 3143
3123 $widget->{w} = $w; 3144 $widget->{w} = $w;

Diff Legend

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