diff --git a/packages/debugger-shell/src/electron/MainInstanceEntryPoint.js b/packages/debugger-shell/src/electron/MainInstanceEntryPoint.js index 41693cc14bc..473e96eedad 100644 --- a/packages/debugger-shell/src/electron/MainInstanceEntryPoint.js +++ b/packages/debugger-shell/src/electron/MainInstanceEntryPoint.js @@ -68,6 +68,8 @@ function handleLaunchArgs(argv: string[]) { }, // Icon for Linux icon: path.join(__dirname, 'resources', 'icon.png'), + // Enable tabs for this window (macOS 10.12+) + tabbingIdentifier: 'main', }); // Auto-hide the Windows/Linux menu bar frontendWindow.setMenuBarVisibility(false); diff --git a/packages/debugger-shell/src/electron/index.flow.js b/packages/debugger-shell/src/electron/index.flow.js index cbfe8bf3b3d..bdd847d5ee0 100644 --- a/packages/debugger-shell/src/electron/index.flow.js +++ b/packages/debugger-shell/src/electron/index.flow.js @@ -20,6 +20,9 @@ const {app} = require('electron') as any; app.setName(pkg.productName ?? pkg.name); app.setVersion(pkg.version + '-' + buildInfo.revision); +// Enable automatic tab support (macOS 10.12+) +app.commandLine.appendSwitch('enable-features', 'TabStrip'); + // Handle global command line arguments which don't require a window // or the single instance lock to be held. const {