Skip to content

Commit d397af2

Browse files
ickshonpeickshonpe
committed
Reformat, add another weight test case.
1 parent 4c5d788 commit d397af2

File tree

1 file changed

+84
-30
lines changed

1 file changed

+84
-30
lines changed

‎examples/testbed/ui.rs‎

Lines changed: 84 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,11 @@ mod text {
194194
],
195195
));
196196

197+
let mut top = 300.;
197198
commands.spawn((
198199
Node {
199200
left: px(100.),
200-
top: px(290.),
201+
top: px(top),
201202
..Default::default()
202203
},
203204
Text::new(""),
@@ -237,16 +238,18 @@ mod text {
237238
TextSpan::new(""),
238239
],
239240
));
241+
242+
top += 35.;
240243
commands.spawn((
241244
Node {
242245
left: px(100.),
243-
top: px(350.),
246+
top: px(top),
244247
..Default::default()
245248
},
246249
Text::new("FiraSans_"),
247250
TextFont {
248251
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
249-
font_size: 40.,
252+
font_size: 25.,
250253
..default()
251254
},
252255
DespawnOnExit(super::Scene::Text),
@@ -255,38 +258,39 @@ mod text {
255258
TextSpan::new("MonaSans_"),
256259
TextFont {
257260
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
258-
font_size: 40.,
261+
font_size: 25.,
259262
..default()
260263
}
261264
),
262265
(
263266
TextSpan::new("EBGaramond_"),
264267
TextFont {
265268
font: asset_server.load("fonts/EBGaramond12-Regular.otf"),
266-
font_size: 40.,
269+
font_size: 25.,
267270
..default()
268271
},
269272
),
270273
(
271274
TextSpan::new("FiraMono"),
272275
TextFont {
273276
font: asset_server.load("fonts/FiraMono-Medium.ttf"),
274-
font_size: 40.,
277+
font_size: 25.,
275278
..default()
276279
},
277280
),
278281
],
279282
));
283+
top += 35.;
280284
commands.spawn((
281285
Node {
282286
left: px(100.),
283-
top: px(400.),
287+
top: px(top),
284288
..Default::default()
285289
},
286290
Text::new("FiraSans "),
287291
TextFont {
288292
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
289-
font_size: 40.,
293+
font_size: 25.,
290294
..default()
291295
},
292296
DespawnOnExit(super::Scene::Text),
@@ -295,39 +299,40 @@ mod text {
295299
TextSpan::new("MonaSans "),
296300
TextFont {
297301
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
298-
font_size: 40.,
302+
font_size: 25.,
299303
..default()
300304
}
301305
),
302306
(
303307
TextSpan::new("EBGaramond "),
304308
TextFont {
305309
font: asset_server.load("fonts/EBGaramond12-Regular.otf"),
306-
font_size: 40.,
310+
font_size: 25.,
307311
..default()
308312
},
309313
),
310314
(
311315
TextSpan::new("FiraMono"),
312316
TextFont {
313317
font: asset_server.load("fonts/FiraMono-Medium.ttf"),
314-
font_size: 40.,
318+
font_size: 25.,
315319
..default()
316320
},
317321
),
318322
],
319323
));
320324

325+
top += 35.;
321326
commands.spawn((
322327
Node {
323328
left: px(100.),
324-
top: px(450.),
329+
top: px(top),
325330
..Default::default()
326331
},
327332
Text::new("FiraSans "),
328333
TextFont {
329334
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
330-
font_size: 40.,
335+
font_size: 25.,
331336
..default()
332337
},
333338
DespawnOnExit(super::Scene::Text),
@@ -336,39 +341,40 @@ mod text {
336341
TextSpan::new("MonaSans_"),
337342
TextFont {
338343
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
339-
font_size: 40.,
344+
font_size: 25.,
340345
..default()
341346
}
342347
),
343348
(
344349
TextSpan::new("EBGaramond "),
345350
TextFont {
346351
font: asset_server.load("fonts/EBGaramond12-Regular.otf"),
347-
font_size: 40.,
352+
font_size: 25.,
348353
..default()
349354
},
350355
),
351356
(
352357
TextSpan::new("FiraMono"),
353358
TextFont {
354359
font: asset_server.load("fonts/FiraMono-Medium.ttf"),
355-
font_size: 40.,
360+
font_size: 25.,
356361
..default()
357362
},
358363
),
359364
],
360365
));
361366

367+
top += 35.;
362368
commands.spawn((
363369
Node {
364370
left: px(100.),
365-
top: px(500.),
371+
top: px(top),
366372
..Default::default()
367373
},
368374
Text::new("FiraSans"),
369375
TextFont {
370376
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
371-
font_size: 40.,
377+
font_size: 25.,
372378
..default()
373379
},
374380
DespawnOnExit(super::Scene::Text),
@@ -378,7 +384,7 @@ mod text {
378384
TextSpan::new("MonaSans"),
379385
TextFont {
380386
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
381-
font_size: 40.,
387+
font_size: 25.,
382388
..default()
383389
}
384390
),
@@ -387,7 +393,7 @@ mod text {
387393
TextSpan::new("EBGaramond"),
388394
TextFont {
389395
font: asset_server.load("fonts/EBGaramond12-Regular.otf"),
390-
font_size: 40.,
396+
font_size: 25.,
391397
..default()
392398
},
393399
),
@@ -396,23 +402,24 @@ mod text {
396402
TextSpan::new("FiraMono"),
397403
TextFont {
398404
font: asset_server.load("fonts/FiraMono-Medium.ttf"),
399-
font_size: 40.,
405+
font_size: 25.,
400406
..default()
401407
},
402408
),
403409
],
404410
));
405411

412+
top += 35.;
406413
commands.spawn((
407414
Node {
408415
left: px(100.),
409-
top: px(550.),
416+
top: px(top),
410417
..Default::default()
411418
},
412419
Text::new("Fira Sans_"),
413420
TextFont {
414421
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
415-
font_size: 40.,
422+
font_size: 25.,
416423
..default()
417424
},
418425
DespawnOnExit(super::Scene::Text),
@@ -421,39 +428,40 @@ mod text {
421428
TextSpan::new("Mona Sans_"),
422429
TextFont {
423430
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
424-
font_size: 40.,
431+
font_size: 25.,
425432
..default()
426433
}
427434
),
428435
(
429436
TextSpan::new("EB Garamond_"),
430437
TextFont {
431438
font: asset_server.load("fonts/EBGaramond12-Regular.otf"),
432-
font_size: 40.,
439+
font_size: 25.,
433440
..default()
434441
},
435442
),
436443
(
437444
TextSpan::new("Fira Mono"),
438445
TextFont {
439446
font: asset_server.load("fonts/FiraMono-Medium.ttf"),
440-
font_size: 40.,
447+
font_size: 25.,
441448
..default()
442449
},
443450
),
444451
],
445452
));
446453

454+
top += 35.;
447455
commands.spawn((
448456
Node {
449457
left: px(100.),
450-
top: px(600.),
458+
top: px(top),
451459
..Default::default()
452460
},
453461
Text::new("FontWeight(100)_"),
454462
TextFont {
455463
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
456-
font_size: 40.,
464+
font_size: 25.,
457465
weight: FontWeight(100),
458466
..default()
459467
},
@@ -463,7 +471,7 @@ mod text {
463471
TextSpan::new("FontWeight(500)_"),
464472
TextFont {
465473
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
466-
font_size: 40.,
474+
font_size: 25.,
467475
weight: FontWeight(500),
468476
..default()
469477
}
@@ -472,13 +480,59 @@ mod text {
472480
TextSpan::new("FontWeight(900)"),
473481
TextFont {
474482
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
475-
font_size: 40.,
483+
font_size: 25.,
476484
weight: FontWeight(900),
477485
..default()
478486
},
479487
),
480488
],
481489
));
490+
491+
top += 35.;
492+
commands.spawn((
493+
Node {
494+
left: px(100.),
495+
top: px(top),
496+
..Default::default()
497+
},
498+
Text::new("FiraSans_"),
499+
TextFont {
500+
font: asset_server.load("fonts/FiraSans-Bold.ttf"),
501+
font_size: 25.,
502+
weight: FontWeight(900),
503+
..default()
504+
},
505+
DespawnOnExit(super::Scene::Text),
506+
children![
507+
(
508+
TextSpan::new("MonaSans_"),
509+
TextFont {
510+
font: asset_server.load("fonts/MonaSans-VariableFont.ttf"),
511+
font_size: 25.,
512+
weight: FontWeight(700),
513+
..default()
514+
}
515+
),
516+
(
517+
TextSpan::new("EBGaramond_"),
518+
TextFont {
519+
font: asset_server.load("fonts/EBGaramond12-Regular.otf"),
520+
font_size: 25.,
521+
weight: FontWeight(500),
522+
..default()
523+
},
524+
),
525+
(
526+
TextSpan::new("FiraMono"),
527+
TextFont {
528+
font: asset_server.load("fonts/FiraMono-Medium.ttf"),
529+
font_size: 25.,
530+
weight: FontWeight(300),
531+
..default()
532+
},
533+
),
534+
],
535+
));
482536
}
483537
}
484538

0 commit comments

Comments
 (0)