💄

src/vs/platform/windows/common/windows.ts

@@ -220,7 +220,6 @@ export interface IWindowSettings {
 	nativeTabs: boolean;
 	enableMenuBarMnemonics: boolean;
 	closeWhenEmpty: boolean;
-	touchbarEnabled: boolean;
 }
 
 export enum OpenContext {

src/vs/workbench/browser/parts/editor/titleControl.ts

@@ -441,7 +441,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 		return keybinding ? keybinding.getLabel() : void 0;
 	}
 
-	protected getContextMenuActions(identifier: IEditorIdentifier): IAction[] {
+	private getContextMenuActions(identifier: IEditorIdentifier): IAction[] {
 		const { editor, group } = identifier;
 
 		// Enablement
@@ -454,8 +454,8 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 			this.closeEditorAction,
 			this.closeOtherEditorsAction
 		];
-		const tabOptions = this.editorGroupService.getTabOptions();
 
+		const tabOptions = this.editorGroupService.getTabOptions();
 		if (tabOptions.showTabs) {
 			actions.push(this.closeRightEditorsAction);
 		}

src/vs/workbench/electron-browser/window.ts

@@ -352,8 +352,8 @@ export class ElectronWindow extends Themable {
 		}
 
 		const touchbarEnabled = this.configurationService.getValue<boolean>('keyboard.touchbar.enabled');
-		if (touchbarEnabled === false) {
-			return;
+		if (!touchbarEnabled) {
+			return; // disabled via setting
 		}
 
 		// Dispose old

src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts

@@ -588,7 +588,7 @@ const keyboardConfiguration: IConfigurationNode = {
 		'keyboard.touchbar.enabled': {
 			'type': 'boolean',
 			'default': true,
-			'description': nls.localize('window.touchbar.enabled', "Enables macOS tocuhbar buttons."),
+			'description': nls.localize('touchbar.enabled', "Enables the macOS touchbar buttons on the keyboard if available."),
 			'included': OS === OperatingSystem.Macintosh && parseFloat(release()) >= 16 // Minimum: macOS Sierra (10.12.x = darwin 16.x)
 		}
 	}