fix problem with sidebar

goastian · Jun 30, 2024 · d3b0869 · d3b0869
1 parent 426b663
commit d3b0869
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/floorp/browser/base/content/browser-manager-sidebar-context.inc.xhtml b/floorp/browser/base/content/browser-manager-sidebar-context.inc.xhtml
@@ -6,37 +6,37 @@
   <menupopup id="webpanel-context" onpopupshowing="gBrowserManagerSidebar.contextMenu.show(event);">
     <menuitem id="unloadWebpanelMenu" class="needLoadedWebpanel" data-l10n-id="sidebar2-unload-panel"
       label="Unload this webpanel" accesskey="U" oncommand="gBrowserManagerSidebar.contextMenu.unloadWebpanel();" />
-      <menuseparator class="context-webpanel-separator" />
-      <menuitem id="muteMenu" class="needLoadedWebpanel" data-l10n-id="sidebar2-mute-and-unmute"
-        label="Mute/Unmute this webpanel" accesskey="M" oncommand="gBrowserManagerSidebar.contextMenu.muteWebpanel();" />
-      <menu id="changeZoomLevelMenu" class="needLoadedWebpanel needRunningExtensionsPanel" data-l10n-id="sidebar2-change-zoom-level" label="Change Zoom Level" accesskey="Z">
-        <menupopup id="changeZoomLevelPopup">
-          <menuitem id="zoomInMenu" data-l10n-id="sidebar2-zoom-in" label="Zoom In" accesskey="I"
-            oncommand="gBrowserManagerSidebar.contextMenu.zoomIn();" />
-          <menuitem id="zoomOutMenu" data-l10n-id="sidebar2-zoom-out" label="Zoom Out" accesskey="O"
-            oncommand="gBrowserManagerSidebar.contextMenu.zoomOut();" />
-          <menuitem id="resetZoomMenu" data-l10n-id="sidebar2-reset-zoom" label="Reset Zoom" accesskey="R"
-            oncommand="gBrowserManagerSidebar.contextMenu.resetZoom();" />
-        </menupopup>
-      </menu>
+    <menuseparator class="context-webpanel-separator" />
+    <menuitem id="muteMenu" class="needLoadedWebpanel" data-l10n-id="sidebar2-mute-and-unmute"
+      label="Mute/Unmute this webpanel" accesskey="M" oncommand="gBrowserManagerSidebar.contextMenu.muteWebpanel();" />
+    <menu id="changeZoomLevelMenu" class="needLoadedWebpanel needRunningExtensionsPanel" data-l10n-id="sidebar2-change-zoom-level" label="Change Zoom Level" accesskey="Z">
+      <menupopup id="changeZoomLevelPopup">
+        <menuitem id="zoomInMenu" data-l10n-id="sidebar2-zoom-in" label="Zoom In" accesskey="I"
+          oncommand="gBrowserManagerSidebar.contextMenu.zoomIn();" />
+        <menuitem id="zoomOutMenu" data-l10n-id="sidebar2-zoom-out" label="Zoom Out" accesskey="O"
+          oncommand="gBrowserManagerSidebar.contextMenu.zoomOut();" />
+        <menuitem id="resetZoomMenu" data-l10n-id="sidebar2-reset-zoom" label="Reset Zoom" accesskey="R"
+          oncommand="gBrowserManagerSidebar.contextMenu.resetZoom();" />
+      </menupopup>
+    </menu>
     <menuitem id="changeUAWebpanelMenu" data-l10n-id="sidebar2-change-ua-panel"
       label="Switch User agent to Mobile/Desktop Version at this Webpanel" accesskey="R"
       oncommand="gBrowserManagerSidebar.contextMenu.changeUserAgent();" />
-      <menuseparator class="context-webpanel-separator" />
+    <menuseparator class="context-webpanel-separator" />
     <menuitem id="deleteWebpanelMenu" data-l10n-id="sidebar2-delete-panel" accesskey="D"
       oncommand="gBrowserManagerSidebar.contextMenu.deleteWebpanel();" />
   </menupopup>
 
   <menupopup id="all-panel-context" onpopupshowing="gBrowserManagerSidebar.contextMenu.show(event);">
     <menuitem id="unloadWebpanelMenu" class="needLoadedWebpanel" data-l10n-id="sidebar2-unload-panel"
       label="Unload this webpanel" accesskey="U" oncommand="gBrowserManagerSidebar.contextMenu.unloadWebpanel();" />
-      <menuseparator class="context-webpanel-separator" />
+    <menuseparator class="context-webpanel-separator" />
     <menuitem id="deleteWebpanelMenu" data-l10n-id="sidebar2-delete-panel" accesskey="D"
       oncommand="gBrowserManagerSidebar.contextMenu.deleteWebpanel();" />
   </menupopup>
 
   <menupopup id="width-size-context">
     <menuitem id="setWidthMenu" data-l10n-id="sidebar2-keep-width-for-global" label="Set width for All Panel"
-    accesskey="S" oncommand="gBrowserManagerSidebar.keepWidthToGlobalValue();" />
+      accesskey="S" oncommand="gBrowserManagerSidebar.keepWidthToGlobalValue();" />
   </menupopup>
-</popupset>
+</popupset>
diff --git a/floorp/browser/base/content/browser-manager-sidebar.js b/floorp/browser/base/content/browser-manager-sidebar.js
@@ -909,6 +909,9 @@ var gBrowserManagerSidebar = {
     },
 
     toggleBMSShortcut() {
+      if (!Services.prefs.getBoolPref("floorp.browser.sidebar.enable")) {
+        return;
+      }
       if (gBrowserManagerSidebar.currentPanel == null) {
         gBrowserManagerSidebar.currentPanel = gBrowserManagerSidebar.BROWSER_SIDEBAR_DATA.index[0];
         gBrowserManagerSidebar.controllFunctions.visibleWebpanel();