From 3daf711085889bad1bd68651bc4e8790412ae105 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 26 Apr 2022 10:13:11 -0500 Subject: =?UTF-8?q?Issue=20#1829=20-=20Revert=20=E2=80=9CIssue=20#1751=20-?= =?UTF-8?q?-=20Remove=20XP=5FMACOSX=20conditionals=20from=20the=20rest=20o?= =?UTF-8?q?f=20the=20tree.=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also removes some PP abuse and takes file entries out of PP when no longer needed without XP_MACOSX conditionals. This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740. --- .../client/framework/dev-edition-promo/dev-edition-promo.css | 4 ++++ devtools/client/framework/toolbox-process-window.js | 10 ++++++++++ devtools/client/jar.mn | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) (limited to 'devtools') diff --git a/devtools/client/framework/dev-edition-promo/dev-edition-promo.css b/devtools/client/framework/dev-edition-promo/dev-edition-promo.css index b4d6383825..01489fd47f 100644 --- a/devtools/client/framework/dev-edition-promo/dev-edition-promo.css +++ b/devtools/client/framework/dev-edition-promo/dev-edition-promo.css @@ -21,7 +21,11 @@ window { * depend on. Must style font-size to target linux. */ %ifdef XP_UNIX +%ifndef XP_MACOSX font-size: 13px; +%else + font-size: 15px; +%endif %else font-size: 15px; %endif diff --git a/devtools/client/framework/toolbox-process-window.js b/devtools/client/framework/toolbox-process-window.js index 87b3efa438..82edabe9c6 100644 --- a/devtools/client/framework/toolbox-process-window.js +++ b/devtools/client/framework/toolbox-process-window.js @@ -142,6 +142,16 @@ function evaluateTestScript(script, toolbox) { function bindToolboxHandlers() { gToolbox.once("destroyed", quitApp); window.addEventListener("unload", onUnload); + +#ifdef XP_MACOSX + // Badge the dock icon to differentiate this process from the main application process. + updateBadgeText(false); + + // Once the debugger panel opens listen for thread pause / resume. + gToolbox.getPanelWhenReady("jsdebugger").then(panel => { + setupThreadListeners(panel); + }); +#endif } function setupThreadListeners(panel) { diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index 9951e7e3dc..763a59fbd6 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -110,7 +110,7 @@ devtools.jar: content/framework/toolbox-init.js (framework/toolbox-init.js) content/framework/options-panel.css (framework/options-panel.css) content/framework/toolbox-process-window.xul (framework/toolbox-process-window.xul) - content/framework/toolbox-process-window.js (framework/toolbox-process-window.js) +* content/framework/toolbox-process-window.js (framework/toolbox-process-window.js) content/framework/dev-edition-promo/dev-edition-promo.xul (framework/dev-edition-promo/dev-edition-promo.xul) * content/framework/dev-edition-promo/dev-edition-promo.css (framework/dev-edition-promo/dev-edition-promo.css) content/framework/dev-edition-promo/dev-edition-logo.png (framework/dev-edition-promo/dev-edition-logo.png) -- cgit v1.2.3