@@ -1440,6 +1440,9 @@ export class Font extends EezObject {
1440
1440
try {
1441
1441
let result ;
1442
1442
1443
+ let lvglRanges ;
1444
+ let lvglSymbols ;
1445
+
1443
1446
if ( projectStore . projectTypeTraits . isLVGL ) {
1444
1447
result = await showGenericDialog ( projectStore , {
1445
1448
dialogDefinition : {
@@ -1518,9 +1521,12 @@ export class Font extends EezObject {
1518
1521
result . values . ranges
1519
1522
) ;
1520
1523
1521
- const { encodings, symbols } = removeDuplicates (
1522
- result . values . encodings ,
1523
- result . values . symbols
1524
+ lvglRanges = result . values . ranges ;
1525
+ lvglSymbols = result . values . symbols ;
1526
+
1527
+ const { encodings, symbols } = getLvglEncodingsAndSymbols (
1528
+ lvglRanges ,
1529
+ lvglSymbols
1524
1530
) ;
1525
1531
result . values . encodings = encodings ;
1526
1532
result . values . symbols = symbols ;
@@ -1637,7 +1643,9 @@ export class Font extends EezObject {
1637
1643
size : result . values . size ,
1638
1644
threshold : result . values . threshold ,
1639
1645
createGlyphs : result . values . createGlyphs ,
1640
- encodings : result . values . createGlyphs
1646
+ encodings : projectStore . projectTypeTraits . isLVGL
1647
+ ? result . values . encodings
1648
+ : result . values . createGlyphs
1641
1649
? result . values . encodings
1642
1650
? result . values . encodings
1643
1651
: [
@@ -1653,9 +1661,17 @@ export class Font extends EezObject {
1653
1661
lvglVersion :
1654
1662
projectStore . project . settings . general . lvglVersion ,
1655
1663
lvglInclude :
1656
- projectStore . project . settings . build . lvglInclude
1664
+ projectStore . project . settings . build . lvglInclude ,
1665
+ getAllGlyphs : projectStore . projectTypeTraits . isLVGL
1666
+ ? true
1667
+ : undefined
1657
1668
} ) ;
1658
1669
1670
+ if ( projectStore . projectTypeTraits . isLVGL ) {
1671
+ ( fontProperties as Font ) . lvglRanges = lvglRanges ;
1672
+ ( fontProperties as Font ) . lvglSymbols = lvglSymbols ;
1673
+ }
1674
+
1659
1675
const font = createObject < Font > (
1660
1676
projectStore ,
1661
1677
fontProperties as any ,
0 commit comments