Commit 9a2a0ad
authored
TextStyle.setStyle & TextStyle.setFont now set fontSize, fontStyle & fontFamily when font is a string
TextStyle.setFont now sets fontFamily, fontSize, and fontStyle when "font" is a string.
TextStyle.setStyle calls TextStyle.setFont when "font" is overridden.
This fixes an issue where TextStyle.update(true) overrides TextStyle._font1 parent 1025362 commit 9a2a0ad
1 file changed
Lines changed: 22 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
399 | 399 | | |
400 | 400 | | |
401 | 401 | | |
| 402 | + | |
| 403 | + | |
402 | 404 | | |
403 | 405 | | |
404 | 406 | | |
| |||
515 | 517 | | |
516 | 518 | | |
517 | 519 | | |
| 520 | + | |
518 | 521 | | |
519 | 522 | | |
520 | 523 | | |
521 | | - | |
| 524 | + | |
522 | 525 | | |
| 526 | + | |
| 527 | + | |
523 | 528 | | |
524 | 529 | | |
525 | 530 | | |
| |||
530 | 535 | | |
531 | 536 | | |
532 | 537 | | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
533 | 549 | | |
534 | 550 | | |
535 | 551 | | |
536 | 552 | | |
537 | 553 | | |
538 | 554 | | |
539 | | - | |
540 | | - | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
| 558 | + | |
| 559 | + | |
541 | 560 | | |
542 | 561 | | |
543 | 562 | | |
| |||
0 commit comments