johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #6701 from penpot/elenatorro-fix-custom-font-load
Some checks are pending
Commit Message Check / Check Commit Message (push) Waiting to run
Details

Browse Source 
🐛 Fix storing custom fonts
This commit is contained in:
Alejandro Alonso
2025-06-17 10:06:02 +02:00
committed by GitHub
parent df84396fea d248dd09bc
commit 60dbf02896
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/app/render_wasm/api/fonts.cljs
View File

@@ -66,7 +66,8 @@
(let [font-uuid (custom-font-id->uuid font-id) (let [font-uuid (custom-font-id->uuid font-id)
matching-font (d/seek (fn [[_ font]] matching-font (d/seek (fn [[_ font]]
(and (= (:font-id font) font-uuid) (and (= (:font-id font) font-uuid)
(= (:font-variant-id font) font-variant-id))) (or (nil? (:font-variant-id font))
(= (:font-variant-id font) font-variant-id))))
(seq @fonts))] (seq @fonts))]
(when matching-font (when matching-font
(:ttf-file-id (second matching-font)))) (:ttf-file-id (second matching-font))))
@@ -116,7 +117,7 @@
:google :google
(google-font-ttf-url font-id font-variant-id) (google-font-ttf-url font-id font-variant-id)
:custom :custom
(dm/str (u/join cf/public-uri "assets/by-id/" font-id)) (dm/str (u/join cf/public-uri "assets/by-id/" asset-id))
:builtin :builtin
(dm/str (u/join cf/public-uri "fonts/" asset-id)))) (dm/str (u/join cf/public-uri "fonts/" asset-id))))