fix: remove the weird scrollbar

- Bump electron version to v38
- Remove `FluentScrollbar`
This commit is contained in:
JellyBrick
2025-07-13 16:06:46 +09:00
parent c79fc799b2
commit cf80dd396c
3 changed files with 31 additions and 16 deletions

View File

@ -151,7 +151,7 @@
"cross-env": "7.0.3", "cross-env": "7.0.3",
"del-cli": "6.0.0", "del-cli": "6.0.0",
"discord-api-types": "0.38.15", "discord-api-types": "0.38.15",
"electron": "37.2.1", "electron": "38.0.0-alpha.5",
"electron-builder": "26.0.12", "electron-builder": "26.0.12",
"electron-builder-squirrel-windows": "26.0.12", "electron-builder-squirrel-windows": "26.0.12",
"electron-devtools-installer": "4.0.0", "electron-devtools-installer": "4.0.0",

43
pnpm-lock.yaml generated
View File

@ -36,7 +36,7 @@ importers:
version: 1.0.1(@types/node@22.13.5) version: 1.0.1(@types/node@22.13.5)
'@electron/remote': '@electron/remote':
specifier: 2.1.3 specifier: 2.1.3
version: 2.1.3(electron@37.2.1) version: 2.1.3(electron@38.0.0-alpha.5)
'@ffmpeg.wasm/core-mt': '@ffmpeg.wasm/core-mt':
specifier: 0.12.0 specifier: 0.12.0
version: 0.12.0 version: 0.12.0
@ -51,10 +51,10 @@ importers:
version: 2.0.5 version: 2.0.5
'@ghostery/adblocker-electron': '@ghostery/adblocker-electron':
specifier: 2.11.1 specifier: 2.11.1
version: 2.11.1(electron@37.2.1) version: 2.11.1(electron@38.0.0-alpha.5)
'@ghostery/adblocker-electron-preload': '@ghostery/adblocker-electron-preload':
specifier: 2.11.1 specifier: 2.11.1
version: 2.11.1(electron@37.2.1) version: 2.11.1(electron@38.0.0-alpha.5)
'@hono/node-server': '@hono/node-server':
specifier: 1.15.0 specifier: 1.15.0
version: 1.15.0(hono@4.8.4) version: 1.15.0(hono@4.8.4)
@ -105,7 +105,7 @@ importers:
version: 14.0.0 version: 14.0.0
custom-electron-prompt: custom-electron-prompt:
specifier: 1.5.8 specifier: 1.5.8
version: 1.5.8(electron@37.2.1) version: 1.5.8(electron@38.0.0-alpha.5)
deepmerge-ts: deepmerge-ts:
specifier: 7.1.5 specifier: 7.1.5
version: 7.1.5 version: 7.1.5
@ -294,8 +294,8 @@ importers:
specifier: 0.38.15 specifier: 0.38.15
version: 0.38.15 version: 0.38.15
electron: electron:
specifier: 37.2.1 specifier: 38.0.0-alpha.5
version: 37.2.1 version: 38.0.0-alpha.5
electron-builder: electron-builder:
specifier: 26.0.12 specifier: 26.0.12
version: 26.0.12(electron-builder-squirrel-windows@26.0.12) version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
@ -2331,6 +2331,11 @@ packages:
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
electron@38.0.0-alpha.5:
resolution: {integrity: sha512-h3IB0Z5hGf5zjBDVM9H/B6mNGS8m5NCPcNDe+nOg8qyI3yfKPcE3VVDb8RpAc9cqFhhCvyN7pCt8o5z9a8gejQ==}
engines: {node: '>= 12.20.55'}
hasBin: true
emoji-regex@8.0.0: emoji-regex@8.0.0:
resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
@ -5177,9 +5182,9 @@ snapshots:
- bluebird - bluebird
- supports-color - supports-color
'@electron/remote@2.1.3(electron@37.2.1)': '@electron/remote@2.1.3(electron@38.0.0-alpha.5)':
dependencies: dependencies:
electron: 37.2.1 electron: 38.0.0-alpha.5
'@electron/universal@3.0.0': '@electron/universal@3.0.0':
dependencies: dependencies:
@ -5374,16 +5379,16 @@ snapshots:
dependencies: dependencies:
'@ghostery/adblocker-extended-selectors': 2.11.1 '@ghostery/adblocker-extended-selectors': 2.11.1
'@ghostery/adblocker-electron-preload@2.11.1(electron@37.2.1)': '@ghostery/adblocker-electron-preload@2.11.1(electron@38.0.0-alpha.5)':
dependencies: dependencies:
'@ghostery/adblocker-content': 2.11.1 '@ghostery/adblocker-content': 2.11.1
electron: 37.2.1 electron: 38.0.0-alpha.5
'@ghostery/adblocker-electron@2.11.1(electron@37.2.1)': '@ghostery/adblocker-electron@2.11.1(electron@38.0.0-alpha.5)':
dependencies: dependencies:
'@ghostery/adblocker': 2.11.1 '@ghostery/adblocker': 2.11.1
'@ghostery/adblocker-electron-preload': 2.11.1(electron@37.2.1) '@ghostery/adblocker-electron-preload': 2.11.1(electron@38.0.0-alpha.5)
electron: 37.2.1 electron: 38.0.0-alpha.5
tldts-experimental: 7.0.9 tldts-experimental: 7.0.9
'@ghostery/adblocker-extended-selectors@2.11.1': {} '@ghostery/adblocker-extended-selectors@2.11.1': {}
@ -6815,9 +6820,9 @@ snapshots:
csstype@3.1.3: {} csstype@3.1.3: {}
custom-electron-prompt@1.5.8(electron@37.2.1): custom-electron-prompt@1.5.8(electron@38.0.0-alpha.5):
dependencies: dependencies:
electron: 37.2.1 electron: 38.0.0-alpha.5
data-uri-to-buffer@4.0.1: {} data-uri-to-buffer@4.0.1: {}
@ -7157,6 +7162,14 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
electron@38.0.0-alpha.5:
dependencies:
'@electron/get': 2.0.3
'@types/node': 22.13.5
extract-zip: 2.0.1
transitivePeerDependencies:
- supports-color
emoji-regex@8.0.0: {} emoji-regex@8.0.0: {}
emoji-regex@9.2.2: {} emoji-regex@9.2.2: {}

View File

@ -126,6 +126,8 @@ app.commandLine.appendSwitch(
'enable-features', 'enable-features',
'OverlayScrollbar,SharedArrayBuffer,UseOzonePlatform,WaylandWindowDecorations', 'OverlayScrollbar,SharedArrayBuffer,UseOzonePlatform,WaylandWindowDecorations',
); );
// Disable Fluent Scrollbar (for OverlayScrollbar)
app.commandLine.appendSwitch('disable-features', 'FluentScrollbar');
if (config.get('options.disableHardwareAcceleration')) { if (config.get('options.disableHardwareAcceleration')) {
if (is.dev()) { if (is.dev()) {
console.log('Disabling hardware acceleration'); console.log('Disabling hardware acceleration');