From a267582b4c6e9dc8868add2fc8bd106f526a83a7 Mon Sep 17 00:00:00 2001
From: Keavon Chambers <keavon@keavon.com>
Date: Thu, 3 Aug 2023 23:33:24 -0700
Subject: [PATCH] Fix tool shelf's scrollbar layout shift

Caused by Chromium 113 removing `overflow: overlay;`.
This fixes it for just the tool shelf.
---
 frontend/src/components/Editor.svelte                 | 11 -----------
 .../src/components/floating-menus/MenuList.svelte     |  2 +-
 frontend/src/components/panels/Document.svelte        |  3 ++-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Editor.svelte b/frontend/src/components/Editor.svelte
index cd9248df..514d424b 100644
--- a/frontend/src/components/Editor.svelte
+++ b/frontend/src/components/Editor.svelte
@@ -187,8 +187,6 @@
 		.scrollable-y {
 			// Firefox (standardized in CSS, but less capable)
 			scrollbar-width: thin;
-			scrollbar-width: 6px;
-			scrollbar-gutter: 6px;
 			scrollbar-color: var(--color-5-dullgray) transparent;
 
 			&:not(:hover) {
@@ -234,24 +232,15 @@
 		}
 
 		.scrollable-x.scrollable-y {
-			// Standard
 			overflow: auto;
-			// WebKit
-			overflow: overlay;
 		}
 
 		.scrollable-x:not(.scrollable-y) {
-			// Standard
 			overflow: auto hidden;
-			// WebKit
-			overflow-x: overlay;
 		}
 
 		.scrollable-y:not(.scrollable-x) {
-			// Standard
 			overflow: hidden auto;
-			// WebKit
-			overflow-y: overlay;
 		}
 	}
 
diff --git a/frontend/src/components/floating-menus/MenuList.svelte b/frontend/src/components/floating-menus/MenuList.svelte
index 1dc977cf..a99ffb0a 100644
--- a/frontend/src/components/floating-menus/MenuList.svelte
+++ b/frontend/src/components/floating-menus/MenuList.svelte
@@ -200,7 +200,7 @@
 	bind:this={self}
 >
 	<!-- If we put the scrollableY on the layoutcol for non-font dropdowns then for some reason it always creates a tiny scrollbar.
-	However when we are using the virtual scrolling then we need the layoutcol to be scrolling so we can bind the events without using $refs. -->
+	However when we are using the virtual scrolling then we need the layoutcol to be scrolling so we can bind the events without using `self`. -->
 	<LayoutCol
 		bind:this={scroller}
 		scrollableY={scrollableY && virtualScrollingEntryHeight !== 0}
diff --git a/frontend/src/components/panels/Document.svelte b/frontend/src/components/panels/Document.svelte
index db66b1d0..7215ed78 100644
--- a/frontend/src/components/panels/Document.svelte
+++ b/frontend/src/components/panels/Document.svelte
@@ -144,7 +144,7 @@
 	export function updateDocumentOverlays(svg: string) {
 		overlaysSvg = svg;
 	}
-	
+
 	export function updateDocumentArtboards(svg: string) {
 		artboardSvg = svg;
 		rasterizedCanvas = undefined;
@@ -525,6 +525,7 @@
 
 		.shelf-and-viewport {
 			.shelf {
+				width: 32px;
 				flex: 0 0 auto;
 
 				.tools {