From 69aabb97bf6e8bac8263722eee783f61dc466c82 Mon Sep 17 00:00:00 2001 From: Nuked Date: Mon, 22 Apr 2024 23:45:34 +0200 Subject: [PATCH] bug fix right positioning + autohide --- app/js/functions/utils.js | 16 +++++++++++++--- app/js/sidebar_node.js | 29 ++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/app/js/functions/utils.js b/app/js/functions/utils.js index 542c283..7c8ce7c 100644 --- a/app/js/functions/utils.js +++ b/app/js/functions/utils.js @@ -227,12 +227,22 @@ function createContextMenu(event, subMenus,settingsData) { } menuOptions.appendChild(li); }); - +console.log("lll") // Show context menu sbcontextMenu.style.display = 'block'; - sbcontextMenu.style.left = event.clientX + 'px'; sbcontextMenu.style.top = event.clientY + 'px'; - + if (sbPosition === "left") { + + sbcontextMenu.style.left = event.clientX + 'px'; + } else { + // const sidebar_width = getVar("sidebarWidth"); + //console.log(parseInt(sidebar_width)) + //console.log(event) + //console.log(event.clientX - parseInt(sidebar_width) ) + //temp bugfix + sbcontextMenu.style.left = event.layerX + 'px'; + } + // Hide context menu on body click document.body.addEventListener('click', hideContextMenu); } diff --git a/app/js/sidebar_node.js b/app/js/sidebar_node.js index a278a60..fa12377 100644 --- a/app/js/sidebar_node.js +++ b/app/js/sidebar_node.js @@ -89,8 +89,11 @@ function postPinned() { previewDivTop = (itemPosition.top + this.offsetHeight) - previewDiv.offsetHeight; } - const previewDivLeft = itemPosition.left + this.offsetWidth + correction_offset; - + let previewDivLeft = itemPosition.left + this.offsetWidth + correction_offset; + if (sbPosition == "right") { + + previewDivLeft = -itemPosition.left + this.offsetWidth + correction_offset; + } previewDiv.style.top = `${previewDivTop}px`; previewDiv.style.left = `${previewDivLeft}px`; @@ -563,12 +566,16 @@ async function createCategoryList() { } else { - + previewDivTop = (itemPosition.top + this.offsetHeight) - previewDiv.offsetHeight; } - - const previewDivLeft = itemPosition.left + this.offsetWidth + correction_offset; - + + let previewDivLeft = itemPosition.left + this.offsetWidth + correction_offset; + if (sbPosition == "right") { + + previewDivLeft = -itemPosition.left + this.offsetWidth + correction_offset; + } + previewDiv.style.top = `${previewDivTop}px`; previewDiv.style.left = `${previewDivLeft}px`; @@ -861,10 +868,18 @@ function toggleSHSB(force = undefined) { } main_sidebar.style.width = '45px'; } else { + if (force==undefined) { setVar("sb_minimized", false); + main_sidebar.style.width = getVar("sidebarWidth") || '300px'; + }else if (force==true) { + +main_sidebar.style.width = '45px'; console.log("minimized") + + }else{ + main_sidebar.style.width = getVar("sidebarWidth") || '300px'; } - main_sidebar.style.width = getVar("sidebarWidth") || '300px'; + }