🐛 Fix: fix an issue that clipboard listening is not working in windows

This commit is contained in:
萌萌哒赫萝
2023-05-24 17:14:21 +08:00
parent 0c21017e87
commit 08004561c0
6 changed files with 3 additions and 13 deletions

View File

@@ -19,7 +19,6 @@ import { ensureFilePath, handleCopyUrl } from '~/main/utils/common'
import { T } from '~/main/i18n'
import { isMacOSVersionGreaterThanOrEqualTo } from '~/main/utils/getMacOSVersion'
import { buildPicBedListMenu } from '~/main/events/remotes/menu'
import clipboardListener from 'clipboard-event'
import clipboardPoll from '~/main/utils/clipboardPoll'
import picgo from '../../core/picgo'
import { uploadClipboardFiles } from '../uploader/apis'
@@ -133,7 +132,7 @@ export function createMenu () {
}
export function createContextMenu () {
const ClipboardWatcher = process.platform === 'win32' ? clipboardListener : clipboardPoll
const ClipboardWatcher = clipboardPoll
const isListeningClipboard = db.get('settings.isListeningClipboard') || false
if (process.platform === 'darwin' || process.platform === 'win32') {
const submenu = buildPicBedListMenu()

View File

@@ -15,7 +15,6 @@ import { PicGo as PicGoCore } from 'piclist'
import { T } from '~/main/i18n'
import { changeCurrentUploader } from '~/main/utils/handleUploaderConfig'
import db from '~/main/apis/core/datastore'
import clipboardListener from 'clipboard-event'
import clipboardPoll from '~/main/utils/clipboardPoll'
interface GuiMenuItem {
label: string
@@ -24,7 +23,7 @@ interface GuiMenuItem {
const buildMiniPageMenu = () => {
const isListeningClipboard = db.get('settings.isListeningClipboard') || false
const ClipboardWatcher = process.platform === 'win32' ? clipboardListener : clipboardPoll
const ClipboardWatcher = clipboardPoll
const submenu = buildPicBedListMenu()
const template = [
{

View File

@@ -43,7 +43,6 @@ import UpDownTaskQueue from '../manage/datastore/upDownTaskQueue'
import { T } from '~/main/i18n'
import { UpdateInfo, autoUpdater } from 'electron-updater'
import updateChecker from '../utils/updateChecker'
import clipboardListener from 'clipboard-event'
import clipboardPoll from '../utils/clipboardPoll'
import path from 'path'
import { CLIPBOARD_IMAGE_FOLDER } from '~/universal/utils/static'
@@ -133,7 +132,7 @@ class LifeCycle {
windowManager.create(IWindowList.TRAY_WINDOW)
windowManager.create(IWindowList.SETTING_WINDOW)
const isAutoListenClipboard = db.get('settings.isAutoListenClipboard') || false
const ClipboardWatcher = process.platform === 'win32' ? clipboardListener : clipboardPoll
const ClipboardWatcher = clipboardPoll
if (isAutoListenClipboard) {
db.set('settings.isListeningClipboard', true)
ClipboardWatcher.startListening()