Windows、MacOS平台下的字体列表取消使用原生方式获取（#1596）

lyswhut · Oct 7, 2023 · a786ae2 · a786ae2
1 parent 799b768
commit a786ae2
Show file tree

Hide file tree

Showing 8 changed files with 154 additions and 74 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -163,7 +163,7 @@
     "terser": "^5.21.0",
     "terser-webpack-plugin": "^5.3.9",
     "ts-loader": "^9.4.4",
-    "typescript": "^5.1.6",
+    "typescript": "^5.3.0-beta",
     "vue-eslint-parser": "^9.3.1",
     "vue-loader": "^17.2.2",
     "vue-template-compiler": "^2.7.14",
@@ -179,7 +179,6 @@
     "bufferutil": "^4.0.7",
     "comlink": "~4.3.1",
     "crypto-js": "^4.1.1",
-    "electron-font-manager": "github:lyswhut/electron-font-manager#6d2f5ecf850c4fe34812b9394913680462ee0dae",
     "electron-log": "^5.0.0-rc.1",
     "electron-store": "^8.1.0",
     "font-list": "^1.5.1",

diff --git a/publish/changeLog.md b/publish/changeLog.md
@@ -1,6 +1,7 @@
 ### 修复
 
 - 修复备份文件无法导入json格式的问题
+- Windows、MacOS平台下的字体列表取消使用原生方式获取以修复某些字体应用后无效的问题（#1596）
 
 ### 其他
 

diff --git a/src/main/utils/fontManage.ts b/src/main/utils/fontManage.ts
@@ -3,18 +3,18 @@
 
 // exports.getAvailableFontFamilies = getAvailableFontFamilies
 
-import { getFonts as getFontsByCommand } from 'font-list'
-import { getAvailableFontFamilies } from 'electron-font-manager'
+import { getFonts } from 'font-list'
+// import { getAvailableFontFamilies } from 'electron-font-manager'
 
 
-const getFonts = async() => {
-  switch (process.platform) {
-    case 'win32':
-    case 'darwin':
-      return getAvailableFontFamilies()
-    default: return getFontsByCommand()
-  }
-}
+// const getFonts = async() => {
+//   switch (process.platform) {
+//     case 'win32':
+//     case 'darwin':
+//       return getAvailableFontFamilies()
+//     default: return getFontsByCommand()
+//   }
+// }
 
 export {
   getFonts,

diff --git a/src/renderer-lyric/components/layout/LyricHorizontal/index.vue b/src/renderer-lyric/components/layout/LyricHorizontal/index.vue
@@ -34,7 +34,7 @@ export default {
       return name
     })
     const lrcStyles = computed(() => ({
-      fontFamily: /\s/.test(setting['desktopLyric.style.font']) ? `"${setting['desktopLyric.style.font']}"` : setting['desktopLyric.style.font'],
+      fontFamily: setting['desktopLyric.style.font'],
       fontSize: Math.trunc(setting['desktopLyric.style.fontSize']) + 'px',
       opacity: setting['desktopLyric.style.opacity'] / 100,
       textAlign: setting['desktopLyric.style.align'],

diff --git a/src/renderer-lyric/components/layout/LyricVertical/index.vue b/src/renderer-lyric/components/layout/LyricVertical/index.vue
@@ -33,7 +33,7 @@ export default {
       return name
     })
     const lrcStyles = computed(() => ({
-      fontFamily: /\s/.test(setting['desktopLyric.style.font']) ? `"${setting['desktopLyric.style.font']}"` : setting['desktopLyric.style.font'],
+      fontFamily: setting['desktopLyric.style.font'],
       fontSize: Math.trunc(setting['desktopLyric.style.fontSize']) + 'px',
       opacity: setting['desktopLyric.style.opacity'] / 100,
       textAlign: setting['desktopLyric.style.align'],

diff --git a/src/renderer/core/useApp/useSettingSync.ts b/src/renderer/core/useApp/useSettingSync.ts
@@ -27,7 +27,7 @@ export default () => {
   })
 
   watch(() => appSetting['common.font'], (val) => {
-    document.documentElement.style.fontFamily = /\s/.test(val) ? `"${val}"` : val
+    document.documentElement.style.fontFamily = val
   }, {
     immediate: true,
   })

diff --git a/tsconfig.json b/tsconfig.json
@@ -4,8 +4,8 @@
   "compilerOptions": {
     "target": "ESNext",
     "allowJs": true,
-    "module": "esnext",
-    "moduleResolution": "nodenext",
+    "module": "ESNext",
+    "moduleResolution": "Node",
     "resolveJsonModule": true,
     "outDir": "./dist",
     "baseUrl": "./src",                                     /* Specify the base directory to resolve non-relative module names. */