Skip to content

Commit b46e95a

Browse files
committed
fix LVGL font creation
1 parent 8a50321 commit b46e95a

File tree

1 file changed

+21
-5
lines changed
  • packages/project-editor/features/font

1 file changed

+21
-5
lines changed

packages/project-editor/features/font/font.tsx

+21-5
Original file line numberDiff line numberDiff line change
@@ -1440,6 +1440,9 @@ export class Font extends EezObject {
14401440
try {
14411441
let result;
14421442

1443+
let lvglRanges;
1444+
let lvglSymbols;
1445+
14431446
if (projectStore.projectTypeTraits.isLVGL) {
14441447
result = await showGenericDialog(projectStore, {
14451448
dialogDefinition: {
@@ -1518,9 +1521,12 @@ export class Font extends EezObject {
15181521
result.values.ranges
15191522
);
15201523

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
15241530
);
15251531
result.values.encodings = encodings;
15261532
result.values.symbols = symbols;
@@ -1637,7 +1643,9 @@ export class Font extends EezObject {
16371643
size: result.values.size,
16381644
threshold: result.values.threshold,
16391645
createGlyphs: result.values.createGlyphs,
1640-
encodings: result.values.createGlyphs
1646+
encodings: projectStore.projectTypeTraits.isLVGL
1647+
? result.values.encodings
1648+
: result.values.createGlyphs
16411649
? result.values.encodings
16421650
? result.values.encodings
16431651
: [
@@ -1653,9 +1661,17 @@ export class Font extends EezObject {
16531661
lvglVersion:
16541662
projectStore.project.settings.general.lvglVersion,
16551663
lvglInclude:
1656-
projectStore.project.settings.build.lvglInclude
1664+
projectStore.project.settings.build.lvglInclude,
1665+
getAllGlyphs: projectStore.projectTypeTraits.isLVGL
1666+
? true
1667+
: undefined
16571668
});
16581669

1670+
if (projectStore.projectTypeTraits.isLVGL) {
1671+
(fontProperties as Font).lvglRanges = lvglRanges;
1672+
(fontProperties as Font).lvglSymbols = lvglSymbols;
1673+
}
1674+
16591675
const font = createObject<Font>(
16601676
projectStore,
16611677
fontProperties as any,

0 commit comments

Comments
 (0)