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

Diff Legend

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