diff options
| author | FranklinDM <mrmineshafter17@gmail.com> | 2022-05-04 15:27:02 +0800 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-10-23 21:28:47 +0000 |
| commit | 4f95caf7fbdada83d42f542bb1bd11582f15c937 (patch) | |
| tree | 91dda1605d8f53ef2064e67bced512f73f253276 | |
| parent | 528ae6aeb0fd69994ee5aed950492c42bede0aa3 (diff) | |
| download | uxp-4f95caf7fbdada83d42f542bb1bd11582f15c937.tar.gz | |
Issue #1829 - Follow-up: Mac-specific shortcut key for closing the developer tools toolbox window should not be excluded from other platforms
| -rw-r--r-- | devtools/client/framework/toolbox-window.xul | 11 | ||||
| -rw-r--r-- | devtools/client/jar.mn | 2 |
2 files changed, 8 insertions, 5 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" +#ifdef XP_MACOSX + <key id="toolbox-key-toggle-osx" key="&toggleToolbox.key;" command="toolbox-cmd-close" - modifiers="accel,shift" + modifiers="accel,alt" disabled="true"/> - <key id="toolbox-key-toggle-osx" +#else + <key id="toolbox-key-toggle" key="&toggleToolbox.key;" command="toolbox-cmd-close" - modifiers="accel,alt" + 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) |