diff --git a/src/renderer/src/hooks/useAppInit.ts b/src/renderer/src/hooks/useAppInit.ts
index 531582708d..16bffd1930 100644
--- a/src/renderer/src/hooks/useAppInit.ts
+++ b/src/renderer/src/hooks/useAppInit.ts
@@ -19,7 +19,7 @@ import useUpdateHandler from './useUpdateHandler'
export function useAppInit() {
const dispatch = useAppDispatch()
- const { proxyUrl, language, windowStyle, autoCheckUpdate, proxyMode, customCss, enableDataCollection } = useSettings()
+ const { proxyUrl, language, autoCheckUpdate, proxyMode, customCss, enableDataCollection } = useSettings()
const { minappShow } = useRuntime()
const { setDefaultModel, setTopicNamingModel, setTranslateModel } = useDefaultModel()
const avatar = useLiveQuery(() => db.settings.get('image://avatar'))
@@ -63,16 +63,15 @@ export function useAppInit() {
}, [language])
useEffect(() => {
- const transparentWindow = windowStyle === 'transparent' && isMac && !minappShow
+ const transparentWindow = isMac && !minappShow
if (minappShow) {
- window.root.style.background =
- windowStyle === 'transparent' && isMac ? 'var(--color-background)' : 'var(--navbar-background)'
+ window.root.style.background = isMac ? 'var(--color-background)' : 'var(--navbar-background)'
return
}
window.root.style.background = transparentWindow ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
- }, [windowStyle, minappShow, theme])
+ }, [minappShow, theme])
useEffect(() => {
if (isLocalAi) {
diff --git a/src/renderer/src/hooks/useNavBackgroundColor.ts b/src/renderer/src/hooks/useNavBackgroundColor.ts
index 6c2e94ead3..201e182def 100644
--- a/src/renderer/src/hooks/useNavBackgroundColor.ts
+++ b/src/renderer/src/hooks/useNavBackgroundColor.ts
@@ -1,13 +1,7 @@
import { isMac } from '@renderer/config/constant'
-import { useSettings } from './useSettings'
-
function useNavBackgroundColor() {
- const { windowStyle } = useSettings()
-
- const macTransparentWindow = isMac && windowStyle === 'transparent'
-
- if (macTransparentWindow) {
+ if (isMac) {
return 'transparent'
}
diff --git a/src/renderer/src/hooks/useSettings.ts b/src/renderer/src/hooks/useSettings.ts
index d5ed74541c..9b41888398 100644
--- a/src/renderer/src/hooks/useSettings.ts
+++ b/src/renderer/src/hooks/useSettings.ts
@@ -15,8 +15,7 @@ import {
SettingsState,
setTopicPosition,
setTray as _setTray,
- setTrayOnClose,
- setWindowStyle
+ setTrayOnClose
} from '@renderer/store/settings'
import { SidebarIcon, ThemeMode, TranslateLanguageVarious } from '@renderer/types'
import { FeedUrl } from '@shared/config/constant'
@@ -67,9 +66,6 @@ export function useSettings() {
setTheme(theme: ThemeMode) {
dispatch(setTheme(theme))
},
- setWindowStyle(windowStyle: 'transparent' | 'opaque') {
- dispatch(setWindowStyle(windowStyle))
- },
setTargetLanguage(targetLanguage: TranslateLanguageVarious) {
dispatch(setTargetLanguage(targetLanguage))
},
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index b621912153..1330363aee 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -705,7 +705,8 @@
"warn.siyuan.exporting": "思源ノートにエクスポート中です。重複してエクスポートしないでください!",
"error.yuque.no_config": "語雀のAPIアドレスまたはトークンが設定されていません",
"download.success": "ダウンロードに成功しました",
- "download.failed": "ダウンロードに失敗しました"
+ "download.failed": "ダウンロードに失敗しました",
+ "error.fetchTopicName": "[to be translated]:Failed to name the topic"
},
"minapp": {
"popup": {
@@ -2044,4 +2045,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index f45f97fc0c..ead1d32056 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -705,7 +705,8 @@
"warn.yuque.exporting": "Экспортируется в Yuque, пожалуйста, не отправляйте повторные запросы!",
"warn.siyuan.exporting": "Экспортируется в Siyuan, пожалуйста, не отправляйте повторные запросы!",
"download.success": "Скачано успешно",
- "download.failed": "Скачивание не удалось"
+ "download.failed": "Скачивание не удалось",
+ "error.fetchTopicName": "[to be translated]:Failed to name the topic"
},
"minapp": {
"popup": {
@@ -2044,4 +2045,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
index 2bac0011ec..0a26c03c19 100644
--- a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
+++ b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
@@ -1,7 +1,7 @@
import { SyncOutlined } from '@ant-design/icons'
import CodeEditor from '@renderer/components/CodeEditor'
import { HStack } from '@renderer/components/Layout'
-import { isMac, THEME_COLOR_PRESETS } from '@renderer/config/constant'
+import { THEME_COLOR_PRESETS } from '@renderer/config/constant'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useSettings } from '@renderer/hooks/useSettings'
import useUserTheme from '@renderer/hooks/useUserTheme'
@@ -51,8 +51,7 @@ const ColorCircle = styled.div<{ color: string; isActive?: boolean }>`
`
const DisplaySettings: FC = () => {
- const { windowStyle, setWindowStyle, showTopicTime, pinTopicsToTop, customCss, sidebarIcons, setTheme, userTheme } =
- useSettings()
+ const { showTopicTime, pinTopicsToTop, customCss, sidebarIcons, setTheme, userTheme } = useSettings()
const { theme, settedTheme } = useTheme()
const { t } = useTranslation()
const dispatch = useAppDispatch()
@@ -62,13 +61,6 @@ const DisplaySettings: FC = () => {
const [visibleIcons, setVisibleIcons] = useState(sidebarIcons?.visible || DEFAULT_SIDEBAR_ICONS)
const [disabledIcons, setDisabledIcons] = useState(sidebarIcons?.disabled || [])
- const handleWindowStyleChange = useCallback(
- (checked: boolean) => {
- setWindowStyle(checked ? 'transparent' : 'opaque')
- },
- [setWindowStyle]
- )
-
const handleColorPrimaryChange = useCallback(
(colorHex: string) => {
setUserTheme({
@@ -182,15 +174,6 @@ const DisplaySettings: FC = () => {
/>
- {isMac && (
- <>
-
-
- {t('settings.theme.window.style.transparent')}
-
-
-
- )}
{t('settings.display.zoom.title')}
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index 3eefb5e42e..37f622a88a 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -56,7 +56,6 @@ export interface SettingsState {
tray: boolean
theme: ThemeMode
userTheme: UserTheme
- windowStyle: 'transparent' | 'opaque'
fontSize: number
topicPosition: 'left' | 'right'
showTopicTime: boolean
@@ -205,7 +204,6 @@ export const initialState: SettingsState = {
userTheme: {
colorPrimary: '#00b96b'
},
- windowStyle: 'opaque',
fontSize: 14,
topicPosition: 'left',
showTopicTime: false,
@@ -394,9 +392,6 @@ const settingsSlice = createSlice({
setFontSize: (state, action: PayloadAction) => {
state.fontSize = action.payload
},
- setWindowStyle: (state, action: PayloadAction<'transparent' | 'opaque'>) => {
- state.windowStyle = action.payload
- },
setTopicPosition: (state, action: PayloadAction<'left' | 'right'>) => {
state.topicPosition = action.payload
},
@@ -699,7 +694,6 @@ export const {
setTheme,
setUserTheme,
setFontSize,
- setWindowStyle,
setTopicPosition,
setShowTopicTime,
setPinTopicsToTop,
diff --git a/src/renderer/src/windows/mini/home/HomeWindow.tsx b/src/renderer/src/windows/mini/home/HomeWindow.tsx
index 9982647464..f5b39fc381 100644
--- a/src/renderer/src/windows/mini/home/HomeWindow.tsx
+++ b/src/renderer/src/windows/mini/home/HomeWindow.tsx
@@ -45,7 +45,7 @@ const HomeWindow: FC = () => {
const { defaultModel, quickAssistantModel } = useDefaultModel()
// 如果 quickAssistantModel 未設定，則使用 defaultModel
const model = quickAssistantModel || defaultModel
- const { language, readClipboardAtStartup, windowStyle } = useSettings()
+ const { language, readClipboardAtStartup } = useSettings()
const { theme } = useTheme()
const { t } = useTranslation()
const inputBarRef = useRef(null)
@@ -261,7 +261,7 @@ const HomeWindow: FC = () => {
const backgroundColor = () => {
// ONLY MAC: when transparent style + light theme: use vibrancy effect
// because the dark style under mac's vibrancy effect has not been implemented
- if (isMac && windowStyle === 'transparent' && theme === ThemeMode.light) {
+ if (isMac && theme === ThemeMode.light) {
return 'transparent'
}