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.250 by root, Sun May 28 02:31:03 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
199} 224}
200 225
201sub destroy { 226sub destroy {
202 my ($self) = @_; 227 my ($self) = @_;
… …
205 %$self = (); 230 %$self = ();
206} 231}
207 232
208sub show { 233sub show {
209 my ($self) = @_; 234 my ($self) = @_;
235
210 return if $self->{parent}; 236 return if $self->{parent};
211 237
212 $CFClient::UI::ROOT->add ($self); 238 $CFClient::UI::ROOT->add ($self);
213} 239}
214 240
215sub show_centered { 241sub center {
216 my ($self) = @_; 242 my ($self) = @_;
217 return if $self->{parent};
218
219 $self->show;
220 243
221 $CFClient::UI::ROOT->on_post_alloc ( 244 $CFClient::UI::ROOT->on_post_alloc (
222 "centered $self" => sub { 245 "center_$self" => sub {
223 $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);
224 }, 247 },
225 ); 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);
226} 262}
227 263
228sub set_invisible { 264sub set_invisible {
229 my ($self) = @_; 265 my ($self) = @_;
230 266
267 return unless $self->{visible};
268
231 # broken show/hide model 269 # broken show/hide model
232 270
271 delete $self->{root};
233 delete $self->{visible}; 272 delete $self->{visible};
234 273
235 undef $GRAB if $GRAB == $self; 274 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 275 undef $HOVER if $HOVER == $self;
237 276
238 CFClient::UI::check_tooltip 277 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 278 if $CFClient::UI::TOOLTIP->{owner} == $self;
240 279
241 $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;
242} 300}
243 301
244sub hide { 302sub hide {
245 my ($self) = @_; 303 my ($self) = @_;
246 304
… …
261} 319}
262 320
263sub set_size { 321sub set_size {
264 my ($self, $w, $h) = @_; 322 my ($self, $w, $h) = @_;
265 323
266 $self->{user_w} = $w; 324 $self->{def_w} = $w;
267 $self->{user_h} = $h; 325 $self->{def_h} = $h;
268 326
269 $self->check_size; 327 $self->check_size;
270} 328}
271 329
272sub size_request { 330sub size_request {
… …
294 $self->{y} = $y; 352 $self->{y} = $y;
295 $self->update; 353 $self->update;
296 } 354 }
297 355
298 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
300 } 358 }
301} 359}
302 360
303sub size_allocate { 361sub size_allocate {
304 # nothing to be done 362 # nothing to be done
… …
458sub set_parent { 516sub set_parent {
459 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
460 518
461 Scalar::Util::weaken ($self->{parent} = $parent); 519 Scalar::Util::weaken ($self->{parent} = $parent);
462 520
463 # TODO: req_w _does_change after ->reconfigure 521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
464 $self->check_size 523 $self->check_size;
465 unless exists $self->{req_w};
466
467 $self->show;
468} 524}
469 525
470sub check_size { 526sub check_size {
471 my ($self, $forced) = @_; 527 my ($self, $forced) = @_;
472 528
… …
496sub emit { 552sub emit {
497 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
498 554
499 $self->_emit ($signal, @args) 555 $self->_emit ($signal, @args)
500 || $self->$signal (@args); 556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
501} 561}
502 562
503sub DESTROY { 563sub DESTROY {
504 my ($self) = @_; 564 my ($self) = @_;
505 565
… …
781} 841}
782 842
783sub size_request { 843sub size_request {
784 my ($self) = @_; 844 my ($self) = @_;
785 845
786 @$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)};
787 847
788 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
789} 852}
790 853
791sub size_allocate { 854sub size_allocate {
792 my ($self, $w, $h) = @_; 855 my ($self, $w, $h) = @_;
793 856
… …
853 my $class = shift; 916 my $class = shift;
854 917
855 my $self; 918 my $self;
856 919
857 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
858 vertical => 1, 921 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 923 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 924 $self->{vp}->set_offset (0, $_[1]);
862 }, 925 },
863 ; 926 ;
864 927
865 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
… …
871 $self->{vp}->add ($self->{scrolled}); 934 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp}); 935 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
874 937
875 $self 938 $self
939}
940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 949}
877 950
878sub size_allocate { 951sub size_allocate {
879 my ($self, $w, $h) = @_; 952 my ($self, $w, $h) = @_;
880 953
… …
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1012 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); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1014
942sub new { 1015sub new {
943 my $class = shift; 1016 my $class = shift;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1017
947 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1021 border => 0.6,
… …
1010 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
1011 1082
1012 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
1014 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
1018 $self->check_size; 1091 $self->check_size;
1019 }; 1092 };
1020 1093
1021 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1025 $self->{motion} = sub { 1098 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
1027 1100
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1102
1030 $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});
1031 $self->update; 1107 $self->update;
1032 }; 1108 };
1033 } 1109 }
1034} 1110}
1035 1111
… …
1168sub size_allocate { 1244sub size_allocate {
1169 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h) = @_;
1170 1246
1171 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1172 1248
1173 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1175 1251
1176 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1233 } 1309 }
1234} 1310}
1235 1311
1236############################################################################# 1312#############################################################################
1237 1313
1238package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1239
1240# TODO: wrap into common Box base class
1241 1315
1242our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1243 1317
1244sub size_request { 1318sub size_request {
1245 my ($self) = @_; 1319 my ($self) = @_;
1246 1320
1247 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1248 1322 ? (
1249 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1250 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251 (List::Util::max map $_->[1], @alloc), 1325 )
1252 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1253} 1330}
1254 1331
1255sub size_allocate { 1332sub size_allocate {
1256 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1257 1334
1258 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1259
1260 my $children = $self->{children}; 1336 my $children = $self->{children};
1261 1337
1262 my @h = map $_->{req_w}, @$children; 1338 my @req;
1263 1339
1264 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1265 1341 @req = ($space / (@$children || 1)) x @$children;
1266 if ($req_h > $h) {
1267 # ah well, not enough space
1268 $_ *= $h / $req_h for @h;
1269 } 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 {
1270 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271 $exp ||= 1;
1272 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1273 for (0 .. $#$children) { 1355 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 } 1356 }
1280 } 1357 }
1281 1358
1282 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1283 1360
1284 my $y = 0; 1361 my $pos = 0;
1285 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1286 my $child = $children->[$_];
1287 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1288 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289 1365
1290 $y += $h; 1366 $pos += $alloc;
1291 } 1367 }
1292 1368
1293 1 1369 1
1294} 1370}
1295 1371
1296############################################################################# 1372#############################################################################
1297 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
1298package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1299 1390
1300# TODO: wrap into common Box base class
1301
1302our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1303 1392
1304sub size_request { 1393sub new {
1305 my ($self) = @_; 1394 my $class = shift;
1306 1395
1307 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1308 1397 vertical => 1,
1309 ( 1398 @_,
1310 (List::Util::max map $_->[0], @alloc),
1311 (List::Util::sum map $_->[1], @alloc),
1312 ) 1399 )
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} 1400}
1353 1401
1354############################################################################# 1402#############################################################################
1355 1403
1356package CFClient::UI::Label; 1404package CFClient::UI::Label;
… …
2133} 2181}
2134 2182
2135sub set_range { 2183sub set_range {
2136 my ($self, $range) = @_; 2184 my ($self, $range) = @_;
2137 2185
2138 $self->{range} = $range; 2186 ($range, $self->{range}) = ($self->{range}, $range);
2139 2187
2140 $self->update; 2188 $self->update
2189 if "@$range" ne "@{$self->{range}}";
2141} 2190}
2142 2191
2143sub set_value { 2192sub set_value {
2144 my ($self, $value) = @_; 2193 my ($self, $value) = @_;
2145 2194
… …
2528 2577
2529sub new { 2578sub new {
2530 my $class = shift; 2579 my $class = shift;
2531 2580
2532 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2533 state => 0, 2582 state => 0,
2534 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2535 @_ 2584 @_
2536 ); 2585 );
2537 2586
2538 if ($self->{state}) {
2539 $self->{state} = 0;
2540 $self->toggle_flopper;
2541 }
2542
2543 $self 2587 $self
2544} 2588}
2545 2589
2546sub toggle_flopper { 2590sub toggle_flopper {
2547 my ($self) = @_; 2591 my ($self) = @_;
2548 2592
2549 # TODO: use animation 2593 $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} 2594}
2561 2595
2562############################################################################# 2596#############################################################################
2563 2597
2564package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750 2784
2751 $row++; 2785 $row++;
2752 } 2786 }
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} 2787}
2761 2788
2762############################################################################# 2789#############################################################################
2763 2790
2764package CFClient::UI::Menu; 2791package CFClient::UI::Menu;
… …
2951 2978
2952sub new { 2979sub new {
2953 my $class = shift; 2980 my $class = shift;
2954 2981
2955 $class->SUPER::new ( 2982 $class->SUPER::new (
2983 visible => 1,
2956 @_, 2984 @_,
2957 ) 2985 )
2958} 2986}
2959 2987
2960sub configure { 2988sub configure {
… …
2987 if exists $child->{req_x}; 3015 if exists $child->{req_x};
2988 3016
2989 $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
2990 if exists $child->{req_y}; 3018 if exists $child->{req_y};
2991 3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
2992 $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;
2993 $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;
2994 3024
2995 $child->configure ($X, $Y, $W, $H); 3025 $child->configure ($X, $Y, $W, $H);
2996 } 3026 }
… …
3015 $::WANT_REFRESH++; 3045 $::WANT_REFRESH++;
3016} 3046}
3017 3047
3018sub add { 3048sub add {
3019 my ($self, @children) = @_; 3049 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 3050
3027 for my $child (@children) { 3051 for my $child (@children) {
3028 $child->{is_toplevel} = 1; 3052 $child->{is_toplevel} = 1;
3029 3053
3030 # integerise window positions 3054 # integerise window positions
3031 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
3032 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3033 } 3057 }
3034 3058
3035 $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
3036} 3066}
3037 3067
3038sub remove { 3068sub remove {
3039 my ($self, @children) = @_; 3069 my ($self, @children) = @_;
3040 3070
… …
3066 $_->() 3096 $_->()
3067 for values %{delete $self->{refresh_hook}}; 3097 for values %{delete $self->{refresh_hook}};
3068 } 3098 }
3069 3099
3070 if ($self->{check_size}) { 3100 if ($self->{check_size}) {
3071 my @queue = ([], []); 3101 my @queue;
3072 3102
3073 for (;;) { 3103 while () {
3074 if ($self->{check_size}) { 3104 if ($self->{check_size}) {
3075 # heuristic: check containers last 3105 #TODO use array-of-depth approach
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3106
3107 @queue = sort { $a->{visible} <=> $b->{visible} }
3077 for values %{delete $self->{check_size}} 3108 @queue, values %{delete $self->{check_size}};
3078 } 3109 }
3079 3110
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3111 my $widget = pop @queue || last;
3081 3112
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3083 ? @$widget{qw(user_w user_h)} 3116 ? @$widget{qw(def_w def_h)}
3084 : $widget->size_request; 3117 : $widget->size_request;
3085 3118
3086 if (delete $widget->{force_alloc} 3119 if (delete $widget->{force_alloc}
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) { 3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 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#
… …
3096 if $widget->{parent}; 3129 if $widget->{parent};
3097 } 3130 }
3098 } 3131 }
3099 } 3132 }
3100 3133
3101 while ($self->{size_alloc}) { 3134 while (my $size_alloc = delete $self->{size_alloc}) {
3102 for (values %{delete $self->{size_alloc}}) { 3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3103 my ($widget, $w, $h) = @$_; 3136 values %$size_alloc;
3137
3138 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last };
3104 3140
3105 $w = 0 if $w < 0; 3141 $w = 0 if $w < 0;
3106 $h = 0 if $h < 0; 3142 $h = 0 if $h < 0;
3107 3143
3108 $widget->{w} = $w; 3144 $widget->{w} = $w;

Diff Legend

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