diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index ba457eef5..4e614fc55 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -115,6 +115,7 @@ pref('zen.view.compact.toolbar-hide-after-hover.duration', 1000); pref('zen.view.compact.color-toolbar', true); pref('zen.view.compact.color-sidebar', true); pref('zen.view.compact.animate-sidebar', true); +pref('zen.view.compact.show-sidebar-and-toolbar-on-hover', true); pref('zen.urlbar.replace-newtab', true); pref('zen.urlbar.behavior', 'floating-on-type'); // default, floating-on-type, float diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs index 2dc713b25..298dc38f9 100644 --- a/src/browser/base/zen-components/ZenCompactMode.mjs +++ b/src/browser/base/zen-components/ZenCompactMode.mjs @@ -282,15 +282,28 @@ var gZenCompactModeManager = { }, get hoverableElements() { + if (typeof this._showSidebarAndToolbarOnHover === 'undefined') { + this._showSidebarAndToolbarOnHover = Services.prefs.getBoolPref( + 'zen.view.compact.show-sidebar-and-toolbar-on-hover', + true + ); + } return [ + ...(!this._showSidebarAndToolbarOnHover + ? [] + : [ + { + element: this.sidebar, + screenEdge: this.sidebarIsOnRight ? 'right' : 'left', + keepHoverDuration: 100, + }, + { + element: document.getElementById('zen-appcontent-navbar-container'), + screenEdge: 'top', + }, + ]), { - element: this.sidebar, - screenEdge: this.sidebarIsOnRight ? 'right' : 'left', - keepHoverDuration: 100, - }, - { - element: document.getElementById('zen-appcontent-navbar-container'), - screenEdge: 'top', + element: gZenVerticalTabsManager.actualWindowButtons, }, { element: gZenVerticalTabsManager.actualWindowButtons,