diff --git a/app/package.json b/app/package.json index 925036dd..f6f8964c 100644 --- a/app/package.json +++ b/app/package.json @@ -21,6 +21,7 @@ "color": "4.2.3", "default-shell": "1.0.1", "electron-devtools-installer": "3.2.0", + "electron-drag-click": "^1.0.6", "electron-fetch": "1.9.1", "electron-is-dev": "2.0.0", "electron-store": "8.2.0", diff --git a/app/ui/window.ts b/app/ui/window.ts index 87eba6d7..5eb95daf 100644 --- a/app/ui/window.ts +++ b/app/ui/window.ts @@ -6,6 +6,7 @@ import {app, BrowserWindow, shell, Menu} from 'electron'; import type {BrowserWindowConstructorOptions} from 'electron'; import {enable as remoteEnable} from '@electron/remote/main'; +import electronDragClick from 'electron-drag-click'; import isDev from 'electron-is-dev'; import {getWorkingDirectoryFromPID} from 'native-process-working-directory'; import {v4 as uuidv4} from 'uuid'; @@ -26,6 +27,8 @@ import toElectronBackgroundColor from '../utils/to-electron-background-color'; import contextMenuTemplate from './contextmenu'; +electronDragClick(); + export function newWindow( options_: BrowserWindowConstructorOptions, cfg: configOptions, diff --git a/app/yarn.lock b/app/yarn.lock index 1b3244dc..7e764d8b 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -176,6 +176,13 @@ binary-extensions@^2.0.0: resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -356,6 +363,14 @@ electron-devtools-installer@3.2.0: tslib "^2.1.0" unzip-crx-3 "^0.2.0" +electron-drag-click@^1.0.6: + version "1.0.6" + resolved "https://registry.npmjs.org/electron-drag-click/-/electron-drag-click-1.0.6.tgz#615a4aa68fc793785bfe72f5f35cf9d3d206fe4e" + integrity sha512-YdrRbosgencGmRKQ/sEJeRJ8WeVBLRTZHqnvyht7lEMoCnM98gkEzbvFqG+MZ6D7PsQoobr4E7+dqRAsurcM2A== + dependencies: + bindings "^1.5.0" + node-addon-api "^3.0.2" + electron-fetch@1.9.1: version "1.9.1" resolved "https://registry.npmjs.org/electron-fetch/-/electron-fetch-1.9.1.tgz#e28bfe78d467de3f2dec884b1d72b8b05322f30f" @@ -453,18 +468,6 @@ fast-deep-equal@^3.1.3: resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-uri@^3.0.1: - version "3.0.6" - resolved "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz#88f130b77cfaea2378d56bf970dea21257a68748" - integrity sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw== - -fill-range@^7.1.1: - version "7.1.1" - resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" - integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== - dependencies: - to-regex-range "^5.0.1" - find-up@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -976,7 +979,7 @@ nice-try@^1.0.4: resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-addon-api@^3.1.0: +node-addon-api@^3.0.2, node-addon-api@^3.1.0: version "3.2.1" resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== diff --git a/yarn.lock b/yarn.lock index cd4a0ec4..80fb2d19 100644 --- a/yarn.lock +++ b/yarn.lock @@ -535,9 +535,9 @@ optionalDependencies: global-agent "^3.0.0" -"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2": +"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2": version "10.2.0-electron.1" - resolved "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" + resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2" dependencies: env-paths "^2.2.0" exponential-backoff "^3.1.1"