3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-05 21:51:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

♻️ Simplify font ids

Browse source
This commit is contained in:
Belén Albeza 2025-03-28 15:21:42 +01:00
parent c6bba54573
commit 219d9af885
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
frontend/src/app/render_wasm/api/fonts.cljs
View file

@ -10,7 +10,7 @@
[app.common.data.macros :as dm] [app.common.data.macros :as dm]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.config :as cf] [app.config :as cf]
[app.main.fonts :as fonts] [app.main.fonts :as f]
[app.main.store :as st] [app.main.store :as st]
[app.render-wasm.helpers :as h] [app.render-wasm.helpers :as h]
[app.render-wasm.wasm :as wasm] [app.render-wasm.wasm :as wasm]
@ -27,14 +27,23 @@
(defn- google-font-id->uuid (defn- google-font-id->uuid
[font-id] [font-id]
(let [font (get @fonts/fontsdb font-id)] (let [font (get @f/fontsdb font-id)]
(:uuid font))) (:uuid font)))
(defn- custom-font-id->uuid
[font-id]
(uuid/uuid (subs font-id (inc (str/index-of font-id "-")))))
(defn ^:private font->ttf-id [font-uuid font-style font-weight] (defn- font-id->uuid [font-id]
(if (str/starts-with? font-uuid "gfont-") (if (str/starts-with? font-id "gfont-")
font-uuid (google-font-id->uuid font-id)
(let [matching-font (d/seek (fn [[_ font]] (custom-font-id->uuid font-id)))
(defn ^:private font-id->ttf-id [font-id font-style font-weight]
(if (str/starts-with? font-id "gfont-")
font-id
(let [font-uuid (custom-font-id->uuid font-id)
matching-font (d/seek (fn [[_ font]]
(and (= (:font-id font) font-uuid) (and (= (:font-id font) font-uuid)
(= (:font-style font) font-style) (= (:font-style font) font-style)
(= (:font-weight font) font-weight))) (= (:font-weight font) font-weight)))
@ -71,7 +80,7 @@
(defn- google-font-ttf-url (defn- google-font-ttf-url
[font-id font-variant-id] [font-id font-variant-id]
(let [font (get @fonts/fontsdb font-id) (let [font (get @f/fontsdb font-id)
variant (d/seek (fn [variant] variant (d/seek (fn [variant]
(= (:id variant) font-variant-id)) (= (:id variant) font-variant-id))
(:variants font)) (:variants font))
@ -127,7 +136,6 @@
[fonts] [fonts]
(keep (fn [font] (keep (fn [font]
(let [font-id (dm/get-prop font :font-id) (let [font-id (dm/get-prop font :font-id)
google-font? (str/starts-with? font-id "gfont-")
font-variant-id (dm/get-prop font :font-variant-id) font-variant-id (dm/get-prop font :font-variant-id)
variant-parts (str/split font-variant-id #"\-") variant-parts (str/split font-variant-id #"\-")
variant-parts (if (= (count variant-parts) 1) variant-parts (if (= (count variant-parts) 1)
@ -135,13 +143,9 @@
variant-parts) variant-parts)
style (first variant-parts) style (first variant-parts)
weight (serialize-font-weight (last variant-parts)) weight (serialize-font-weight (last variant-parts))
font-id (if google-font? asset-id (font-id->ttf-id font-id style weight)
font-id wasm-id (font-id->uuid font-id)
(uuid/uuid (subs font-id (inc (str/index-of font-id "-"))))) font-data {:wasm-id wasm-id
asset-id (font->ttf-id font-id style weight)
wasm-id (if google-font? (google-font-id->uuid font-id) font-id)
font-data {:family-id font-id
:wasm-id wasm-id
:font-variant-id font-variant-id :font-variant-id font-variant-id
:style (serialize-font-style style) :style (serialize-font-style style)
:weight weight}] :weight weight}]

2
render-wasm/src/render/fonts.rs
View file

@ -66,8 +66,6 @@ impl FontStore {
return Ok(()); return Ok(());
} }
println!("Adding font: {:?}", family);
let alias = format!("{}", family); let alias = format!("{}", family);
let typeface = self let typeface = self
.font_mgr .font_mgr