From 7a7a5565b9e5f7060b47cb8351888251204706f3 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Thu, 4 May 2023 08:45:37 +0000
Subject: [PATCH] fix: use left position of sidebar to set viewer width

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/views/Viewer.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue
index e0d7f0230..2d6b1dff1 100644
--- a/src/views/Viewer.vue
+++ b/src/views/Viewer.vue
@@ -58,7 +58,7 @@
 		:has-previous="hasPrevious"
 		:inline-actions="canEdit ? 1 : 0"
 		:spread-navigation="true"
-		:style="{ width: isSidebarShown ? `calc(100% - ${sidebarWidth}px)` : null }"
+		:style="{ width: isSidebarShown ? `${sidebarPosition}px` : null }"
 		:title="currentFile.basename"
 		:view="currentFile.modal"
 		class="viewer"
@@ -226,7 +226,7 @@ export default {
 			cancelRequestFolder: () => {},
 
 			// Flags
-			sidebarWidth: 0,
+			sidebarPosition: 0,
 			isSidebarShown: false,
 			canSwipe: true,
 			isStandalone: !(OCA && OCA.Files && 'fileActions' in OCA.Files),
@@ -928,9 +928,10 @@ export default {
 			this.isSidebarShown = true
 			const sidebar = document.querySelector('aside.app-sidebar')
 			if (sidebar) {
-				this.sidebarWidth = sidebar.offsetWidth
+				this.sidebarPosition = sidebar.getBoundingClientRect().left
 				this.trapElements = [sidebar]
 			}
+			this.updateSidebarPosition()
 		},
 
 		handleAppSidebarClose() {
@@ -938,11 +939,10 @@ export default {
 			this.trapElements = []
 		},
 
-		onResize(event) {
-			// update sidebar width
+		onResize() {
 			const sidebar = document.querySelector('aside.app-sidebar')
 			if (sidebar) {
-				this.sidebarWidth = sidebar.offsetWidth
+				this.sidebarPosition = sidebar.getBoundingClientRect().left
 			}
 		},