From 8315eb980ce59395ddd196c62a990baa5ab4a1fa Mon Sep 17 00:00:00 2001
From: Hammy <58985301+sgoudham@users.noreply.github.com>
Date: Wed, 13 Nov 2024 17:26:47 +0000
Subject: [PATCH] fix: unify scrollbar highlights across all systems (#183)

---
 CHANGELOG.md                   |  5 +++++
 generateFlavours/editor.xml    | 12 ++++++++----
 generateFlavours/ui.theme.json | 12 ++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8accec..8671225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,12 +8,17 @@
 
 ### Changed
 
+- (Editor/UI): Scrollbar now matches palette colours directly (`surface0` by default, `surface1` on hover.)
+
 ### Deprecated
 
 ### Removed
 
 ### Fixed
 
+- (UI): Removed macOS scrollbar turning yellow on hover. I'm sorry to anyone who liked this behaviour, but it was not
+  supposed to exist in the first place.
+
 ### Security
 
 ## 3.3.5 - 2024-11-01
diff --git a/generateFlavours/editor.xml b/generateFlavours/editor.xml
index b64d064..371c1af 100644
--- a/generateFlavours/editor.xml
+++ b/generateFlavours/editor.xml
@@ -70,10 +70,14 @@
     <option name="SELECTION_BACKGROUND" value="{{isLatte (opacity surface2 0.4) (opacity surface2 0.6)}}"/>
     <option name="SELECTION_FOREGROUND" value=""/>
     <option name="SEPARATOR_BELOW_COLOR" value=""/>
-    <option name="ScrollBar.hoverThumbColor" value="{{opacity overlay0 0.4}}"/>
-    <option name="ScrollBar.thumbColor" value="{{opacity surface1 0.45}}"/>
-    <option name="ScrollBar.Mac.hoverThumbColor" value="{{opacity overlay0 0.4}}"/>
-    <option name="ScrollBar.Mac.thumbColor" value="{{opacity surface1 0.45}}"/>
+    <option name="ScrollBar.thumbColor" value="{{surface0}}"/>
+    <option name="ScrollBar.thumbBorderColor" value="{{surface0}}"/>
+    <option name="ScrollBar.hoverThumbColor" value="{{surface1}}"/>
+    <option name="ScrollBar.hoverThumbBorderColor" value="{{surface1}}"/>
+    <option name="ScrollBar.Mac.thumbColor" value="{{surface0}}"/>
+    <option name="ScrollBar.Mac.thumbBorderColor" value="{{surface0}}"/>
+    <option name="ScrollBar.Mac.hoverThumbColor" value="{{surface1}}"/>
+    <option name="ScrollBar.Mac.hoverThumbBorderColor" value="{{surface1}}"/>
     <option name="TAB_UNDERLINE" value="{{mauve}}"/>
     <option name="TAB_UNDERLINE_INACTIVE" value="{{text}}"/>
     <option name="TEARLINE_COLOR" value="{{surface0}}"/>
diff --git a/generateFlavours/ui.theme.json b/generateFlavours/ui.theme.json
index b5a5fc4..5c506a2 100644
--- a/generateFlavours/ui.theme.json
+++ b/generateFlavours/ui.theme.json
@@ -335,11 +335,15 @@
       "stopBackground": "red"
     },
     "ScrollBar": {
+      "thumbBorderColor": "surface0",
+      "thumbColor": "surface0",
+      "hoverThumbColor": "surface1",
+      "hoverThumbBorderColor": "surface1",
       "Mac": {
-        "Transparent": {
-          "hoverThumbColor": "secondaryAccentColor"
-        },
-        "hoverThumbColor": "secondaryAccentColor"
+        "thumbBorderColor": "surface0",
+        "thumbColor": "surface0",
+        "hoverThumbColor": "surface1",
+        "hoverThumbBorderColor": "surface1"
       }
     },
     "SearchEverywhere": {