From d02383072796fb6e7a77038b9356875088d6eb14 Mon Sep 17 00:00:00 2001
From: FranklinDM <mrmineshafter17@gmail.com>
Date: Wed, 4 May 2022 15:27:02 +0800
Subject: [PATCH] Issue #1829 - Follow-up: Mac-specific shortcut key for
 closing the developer tools toolbox window should not be excluded from other
 platforms

---
 devtools/client/framework/toolbox-window.xul | 13 ++++++++-----
 devtools/client/jar.mn                       |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/devtools/client/framework/toolbox-window.xul b/devtools/client/framework/toolbox-window.xul
index cd14a3597c..af8b55fb3d 100644
--- a/devtools/client/framework/toolbox-window.xul
+++ b/devtools/client/framework/toolbox-window.xul
@@ -26,16 +26,19 @@
          key="&closeCmd.key;"
          command="toolbox-cmd-close"
          modifiers="accel"/>
-    <key id="toolbox-key-toggle"
-         key="&toggleToolbox.key;"
-         command="toolbox-cmd-close"
-         modifiers="accel,shift"
-         disabled="true"/>
+#ifdef XP_MACOSX
     <key id="toolbox-key-toggle-osx"
          key="&toggleToolbox.key;"
          command="toolbox-cmd-close"
          modifiers="accel,alt"
          disabled="true"/>
+#else
+    <key id="toolbox-key-toggle"
+         key="&toggleToolbox.key;"
+         command="toolbox-cmd-close"
+         modifiers="accel,shift"
+         disabled="true"/>
+#endif
     <key id="toolbox-key-toggle-F12"
          keycode="&toggleToolboxF12.keycode;"
          keytext="&toggleToolboxF12.keytext;"
diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
index 763a59fbd6..95965873f0 100644
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -104,7 +104,7 @@ devtools.jar:
     content/commandline/commandline.css (commandline/commandline.css)
     content/commandline/commandlineoutput.xhtml (commandline/commandlineoutput.xhtml)
     content/commandline/commandlinetooltip.xhtml (commandline/commandlinetooltip.xhtml)
-    content/framework/toolbox-window.xul (framework/toolbox-window.xul)
+*   content/framework/toolbox-window.xul (framework/toolbox-window.xul)
     content/framework/toolbox-options.xhtml (framework/toolbox-options.xhtml)
     content/framework/toolbox.xul (framework/toolbox.xul)
     content/framework/toolbox-init.js (framework/toolbox-init.js)