From 7ef6fd13cf4eb8ec50032d31e9f8364f908f6e98 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sat, 28 Jun 2025 21:10:48 +0000
Subject: [PATCH] navpane: fix scrollbar overlap

---
 copyparty/web/browser.css | 9 ++++++---
 copyparty/web/browser.js  | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/copyparty/web/browser.css b/copyparty/web/browser.css
index eb8331fc..aa42d98b 100644
--- a/copyparty/web/browser.css
+++ b/copyparty/web/browser.css
@@ -4,6 +4,8 @@
 	--grid-sz: 10em;
 	--grid-ln: 3;
 	--nav-sz: 16em;
+	--sbw: 0.5em;
+	--sbh: 0.5em;
 
 	--fg: #ccc;
 	--fg-max: #fff;
@@ -1558,8 +1560,8 @@ html {
 	z-index: 1;
 	position: fixed;
 	background: var(--tree-bg);
-	left: -.98em;
-	width: calc(var(--nav-sz) - 0.5em);
+	left: -.96em;
+	width: calc(.3em + var(--nav-sz) - var(--sbw));
 	border-bottom: 1px solid var(--bg-u5);
 	overflow: hidden;
 }
@@ -3066,7 +3068,8 @@ html.b .ntree a {
 	padding: .6em .2em;
 }
 html.b #treepar {
-	margin-left: .62em;
+	margin-left: .63em;
+	width: calc(.1em + var(--nav-sz) - var(--sbw));
 	border-bottom: .2em solid var(--f-h-b1);
 }
 html.b #wrap {
diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index e91facc4..716a192c 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -2258,14 +2258,17 @@ SPINNER = m[0];
 
 
 var SBW, SBH;  // scrollbar size
-(function () {
+function read_sbw() {
 	var el = mknod('div');
-	el.style.cssText = 'overflow:scroll;width:100px;height:100px';
+	el.style.cssText = 'overflow:scroll;width:100px;height:100px;position:absolute;top:0;left:0';
 	document.body.appendChild(el);
 	SBW = el.offsetWidth - el.clientWidth;
 	SBH = el.offsetHeight - el.clientHeight;
 	document.body.removeChild(el);
-})();
+	setcvar('--sbw', SBW + 'px');
+	setcvar('--sbh', SBH + 'px');
+}
+onresize100.add(read_sbw, true);
 
 
 var have_webp = sread('have_webp');