Display menu above old popovers/under new ones

pjeby · Mar 13, 2022 · 97c192f · 97c192f
1 parent d13d477
commit 97c192f
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 30 deletions.
diff --git a/main.js b/main.js
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "quick-explorer",
   "name": "Quick Explorer",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Perform file explorer operations (and see your current file path) from the title bar, using the mouse or keyboard",
   "minAppVersion": "0.13.23",
   "isDesktopOnly": true

diff --git a/src/FolderMenu.ts b/src/FolderMenu.ts
@@ -61,11 +61,6 @@ export class FolderMenu extends PopupMenu {
         this.scope.register(["Mod"],     "End", this.doScroll.bind(this,  1, true));
 
         const { dom } = this;
-        dom.style.setProperty(
-            // Allow popovers (hover preview) to overlay this menu
-            "--layer-menu", "" + (parseInt(getComputedStyle(document.body).getPropertyValue("--layer-popover")) - 1)
-        );
-
         const menuItem = ".menu-item[data-file-path]";
         dom.on("click",       menuItem, this.onItemClick, true);
         dom.on("contextmenu", menuItem, this.onItemMenu );

diff --git a/src/styles.scss b/src/styles.scss
@@ -29,6 +29,10 @@
     }
 }
 
+.menu.qe-popup-menu ~ .popover.hover-popover {
+    z-index: var(--layer-menu);
+}
+
 .qe-popup-menu .menu-item:not(.is-disabled):not(.is-label) {
     display: flex;
     align-items: center;    // vertically center icon, filename, and extension

diff --git a/styles.css b/styles.css
@@ -20,6 +20,9 @@
   #quick-explorer .explorable-separator::before {
     content: "\00a0/\00a0"; }
 
+.menu.qe-popup-menu ~ .popover.hover-popover {
+  z-index: var(--layer-menu); }
+
 .qe-popup-menu .menu-item:not(.is-disabled):not(.is-label) {
   display: flex;
   align-items: center; }

diff --git a/versions.json b/versions.json
@@ -1,5 +1,5 @@
 {
-    "0.1.13": "0.13.23",
+    "0.1.14": "0.13.23",
     "0.1.9": "0.12.12",
     "0.0.5": "0.12.10",
     "0.0.1": "0.12.3"