fix: font name duplicated if installed default font

Signed-off-by: Innei <i@innei.in>
RSSNext · Aug 19, 2024 · 1efdd40 · 1efdd40
1 parent 0a190d3
commit 1efdd40
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/main/window.ts b/src/main/window.ts
@@ -53,7 +53,7 @@ export function createWindow(
           x: 18,
           y: 18,
         },
-        vibrancy: "sidebar",
+        vibrancy: "under-window",
         visualEffectState: "active",
         transparent: true,
       } as Electron.BrowserWindowConstructorOptions)

diff --git a/...src/components/ui/background/vibrancy.tsx → ...ponents/ui/background/WindowUnderBlur.tsx b/...src/components/ui/background/vibrancy.tsx → ...ponents/ui/background/WindowUnderBlur.tsx
@@ -5,7 +5,7 @@ type Props = Component<
   React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>
 >
 const MacOSVibrancy: Props = ({ className, children, ...rest }) => (
-  <div className={cn("bg-native/50 dark:bg-native/10", className)} {...rest}>
+  <div className={cn("bg-native/30 dark:bg-native/10", className)} {...rest}>
     {children}
   </div>
 )

diff --git a/src/renderer/src/components/ui/background/index.ts b/src/renderer/src/components/ui/background/index.ts
@@ -1 +1 @@
-export * from "./vibrancy"
+export * from "./WindowUnderBlur"
diff --git a/src/renderer/src/modules/settings/modules/fonts.tsx b/src/renderer/src/modules/settings/modules/fonts.tsx
@@ -99,7 +99,7 @@ export const ContentFontSelector = () => {
 
 export const UIFontSelector = () => {
   // filter out the fallback font
-  const data = useFontData().slice(1)
+  const data = useFontData().slice(1).filter((d) => d.value !== DEFAULT_FONT)
   const uiFont = useUISettingSelector((state) => state.uiFontFamily)
   const setCustom = usePresentCustomFontDialog("uiFontFamily")
   const isCustomFont = useMemo(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export * from "./vibrancy"
		export * from "./WindowUnderBlur"