From ffcb77934738ed96900352108d3126adb2e82ed2 Mon Sep 17 00:00:00 2001 From: Kuingsmile <96409857+Kuingsmile@users.noreply.github.com> Date: Thu, 15 Jan 2026 11:39:46 +0800 Subject: [PATCH] :bug: Fix(custom): fix sort drop down content css issue ISSUES CLOSED: #460 --- src/main/lifeCycle/index.ts | 8 +------- src/main/utils/configPaths.ts | 11 +++++++---- src/renderer/manage/pages/css/BucketPage.css | 7 ++++--- src/renderer/utils/configPaths.ts | 15 ++++++++++++--- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/main/lifeCycle/index.ts b/src/main/lifeCycle/index.ts index 6d9c6bf8..db194588 100644 --- a/src/main/lifeCycle/index.ts +++ b/src/main/lifeCycle/index.ts @@ -11,7 +11,7 @@ import { createTray, setDockMenu } from 'apis/app/system' import { uploadChoosedFiles, uploadClipboardFiles } from 'apis/app/uploader/apis' import windowManager from 'apis/app/window/windowManager' import axios from 'axios' -import { app, globalShortcut, nativeTheme, Notification, protocol, screen } from 'electron' +import { app, globalShortcut, Notification, protocol, screen } from 'electron' import updater from 'electron-updater' import fs from 'fs-extra' @@ -180,12 +180,6 @@ class LifeCycle { windowManager.create(IWindowList.TRAY_WINDOW) windowManager.create(IWindowList.SETTING_WINDOW) const isAutoListenClipboard = picgo.getConfig(configPaths.settings.isAutoListenClipboard) || false - const systemTheme = picgo.getConfig<'light' | 'dark' | 'system' | undefined>(configPaths.settings.systemTheme) - if (systemTheme) { - nativeTheme.themeSource = systemTheme - } else { - nativeTheme.themeSource = 'system' - } const ClipboardWatcher = clipboardPoll if (isAutoListenClipboard) { picgo.saveConfig({ [configPaths.settings.isListeningClipboard]: true }) diff --git a/src/main/utils/configPaths.ts b/src/main/utils/configPaths.ts index 73836e18..5468eb4d 100644 --- a/src/main/utils/configPaths.ts +++ b/src/main/utils/configPaths.ts @@ -30,8 +30,7 @@ export interface IConfigStruct { } settings: { shortKey: Record - systemTheme: 'light' | 'dark' | 'auto' - customTheme: string + isAlwaysForceReload: boolean logLevel: string[] logPath: string logFileSizeLimit: number @@ -88,6 +87,8 @@ export interface IConfigStruct { enableSecondUploader?: boolean lastSyncTime?: number theme: string + enableAdvancedAnimation: boolean + isDisableGPU: boolean } needReload: boolean picgoPlugins: IPicGoPlugins @@ -102,6 +103,7 @@ export interface IConfigStruct { skipProcess: { skipProcessExtList: string } + list: IBuildInListItem[] } debug: boolean PICGO_ENV: string @@ -123,8 +125,7 @@ export const configPaths = { _path: 'settings.shortKey', 'picgo:upload': 'settings.shortKey[picgo:upload]', }, - systemTheme: 'settings.systemTheme', - customTheme: 'settings.customTheme', + isAlwaysForceReload: 'settings.isAlwaysForceReload', logLevel: 'settings.logLevel', logPath: 'settings.logPath', logFileSizeLimit: 'settings.logFileSizeLimit', @@ -181,6 +182,8 @@ export const configPaths = { enableSecondUploader: 'settings.enableSecondUploader', lastSyncTime: 'settings.lastSyncTime', theme: 'settings.theme', + enableAdvancedAnimation: 'settings.enableAdvancedAnimation', + isDisableGPU: 'settings.isDisableGPU', }, needReload: 'needReload', picgoPlugins: 'picgoPlugins', diff --git a/src/renderer/manage/pages/css/BucketPage.css b/src/renderer/manage/pages/css/BucketPage.css index 5fb599be..c8f9b557 100644 --- a/src/renderer/manage/pages/css/BucketPage.css +++ b/src/renderer/manage/pages/css/BucketPage.css @@ -263,6 +263,7 @@ /* Control Panel */ .control-panel-card { flex-shrink: 0; + overflow: visible; } .control-panel { @@ -374,7 +375,7 @@ border: 1px solid var(--color-border); border-radius: var(--radius-md); min-width: 150px; - background: var(--color-background-primary); + background: var(--color-background-tiertiary); box-shadow: var(--shadow-lg); } @@ -383,6 +384,7 @@ font-size: 0.875rem; color: var(--color-text-primary); transition: var(--transition-fast); + background: var(--color-background-tertiary); cursor: pointer; } @@ -418,8 +420,7 @@ /* Keep overflow hidden for specific bucket cards that need it */ .content-area, -.breadcrumb-card, -.control-panel-card { +.breadcrumb-card { overflow: hidden; } diff --git a/src/renderer/utils/configPaths.ts b/src/renderer/utils/configPaths.ts index e7894a58..974d9ad7 100644 --- a/src/renderer/utils/configPaths.ts +++ b/src/renderer/utils/configPaths.ts @@ -8,6 +8,12 @@ export interface IConfigStruct { picBed: { uploader: string current?: string + secondUploader?: string + secondUploaderId?: string + secondUploaderConfig?: IStringKeyMap + proxy?: string + transformer?: string + list: IPicBedType[] smms?: ISMMSConfig qiniu?: IQiniuConfig upyun?: IUpYunConfig @@ -20,9 +26,6 @@ export interface IConfigStruct { sftpplist?: ISftpPlistConfig lskyplist?: ILskyConfig 'aws-s3-plist': IAwsS3PListUserConfig - proxy?: string - transformer?: string - list: IPicBedType[] [others: string]: any } settings: { @@ -81,7 +84,11 @@ export interface IConfigStruct { autoImport: boolean autoImportPicBed: string[] galleryPicBedFilter: string[] + enableSecondUploader?: boolean + lastSyncTime?: number theme: string + enableAdvancedAnimation: boolean + isDisableGPU: boolean } needReload: boolean picgoPlugins: IPicGoPlugins @@ -175,6 +182,8 @@ export const configPaths = { enableSecondUploader: 'settings.enableSecondUploader', secondPicBedMode: 'settings.secondPicBedMode', theme: 'settings.theme', + enableAdvancedAnimation: 'settings.enableAdvancedAnimation', + isDisableGPU: 'settings.isDisableGPU', }, needReload: 'needReload', picgoPlugins: 'picgoPlugins',