From cf80dd396c81dd57f16e87db61fcdd9425a497e1 Mon Sep 17 00:00:00 2001
From: JellyBrick <shlee1503@naver.com>
Date: Sun, 13 Jul 2025 16:06:46 +0900
Subject: [PATCH] fix: remove the weird scrollbar

- Bump electron version to v38
- Remove `FluentScrollbar`
---
 package.json   |  2 +-
 pnpm-lock.yaml | 43 ++++++++++++++++++++++++++++---------------
 src/index.ts   |  2 ++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index be653c35..175e4b76 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "cross-env": "7.0.3",
     "del-cli": "6.0.0",
     "discord-api-types": "0.38.15",
-    "electron": "37.2.1",
+    "electron": "38.0.0-alpha.5",
     "electron-builder": "26.0.12",
     "electron-builder-squirrel-windows": "26.0.12",
     "electron-devtools-installer": "4.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a7e1eb01..9bc59934 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,7 +36,7 @@ importers:
         version: 1.0.1(@types/node@22.13.5)
       '@electron/remote':
         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':
         specifier: 0.12.0
         version: 0.12.0
@@ -51,10 +51,10 @@ importers:
         version: 2.0.5
       '@ghostery/adblocker-electron':
         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':
         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':
         specifier: 1.15.0
         version: 1.15.0(hono@4.8.4)
@@ -105,7 +105,7 @@ importers:
         version: 14.0.0
       custom-electron-prompt:
         specifier: 1.5.8
-        version: 1.5.8(electron@37.2.1)
+        version: 1.5.8(electron@38.0.0-alpha.5)
       deepmerge-ts:
         specifier: 7.1.5
         version: 7.1.5
@@ -294,8 +294,8 @@ importers:
         specifier: 0.38.15
         version: 0.38.15
       electron:
-        specifier: 37.2.1
-        version: 37.2.1
+        specifier: 38.0.0-alpha.5
+        version: 38.0.0-alpha.5
       electron-builder:
         specifier: 26.0.12
         version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
@@ -2331,6 +2331,11 @@ packages:
     engines: {node: '>= 12.20.55'}
     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:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
@@ -5177,9 +5182,9 @@ snapshots:
       - bluebird
       - supports-color
 
-  '@electron/remote@2.1.3(electron@37.2.1)':
+  '@electron/remote@2.1.3(electron@38.0.0-alpha.5)':
     dependencies:
-      electron: 37.2.1
+      electron: 38.0.0-alpha.5
 
   '@electron/universal@3.0.0':
     dependencies:
@@ -5374,16 +5379,16 @@ snapshots:
     dependencies:
       '@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:
       '@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:
       '@ghostery/adblocker': 2.11.1
-      '@ghostery/adblocker-electron-preload': 2.11.1(electron@37.2.1)
-      electron: 37.2.1
+      '@ghostery/adblocker-electron-preload': 2.11.1(electron@38.0.0-alpha.5)
+      electron: 38.0.0-alpha.5
       tldts-experimental: 7.0.9
 
   '@ghostery/adblocker-extended-selectors@2.11.1': {}
@@ -6815,9 +6820,9 @@ snapshots:
 
   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:
-      electron: 37.2.1
+      electron: 38.0.0-alpha.5
 
   data-uri-to-buffer@4.0.1: {}
 
@@ -7157,6 +7162,14 @@ snapshots:
     transitivePeerDependencies:
       - 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@9.2.2: {}
diff --git a/src/index.ts b/src/index.ts
index 6ab031aa..af5a1f55 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -126,6 +126,8 @@ app.commandLine.appendSwitch(
   'enable-features',
   'OverlayScrollbar,SharedArrayBuffer,UseOzonePlatform,WaylandWindowDecorations',
 );
+// Disable Fluent Scrollbar (for OverlayScrollbar)
+app.commandLine.appendSwitch('disable-features', 'FluentScrollbar');
 if (config.get('options.disableHardwareAcceleration')) {
   if (is.dev()) {
     console.log('Disabling hardware acceleration');