Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-10-02 05:51:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional for overrideCommandForWebview

Browse Source 
This command should be active if:

- we are on mac
- or we are not using custom title bars

The previous code was incorrectly disabling these commands entirely on mac
This commit is contained in:
Matt Bierner
2020-07-13 10:56:21 -07:00
parent 1cfd3a1b28
commit 2b5ac23284
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/webview/electron-browser/webview.contribution.ts
+6 -7
View File
@@ -47,15 +47,14 @@ const PRIORITY = 100;
function overrideCommandForWebview(command: MultiCommand | undefined, f: (webview: ElectronWebviewBasedWebview) => void) {
command?.addImplementation(PRIORITY, accessor => {
if (!isMacintosh || accessor.get(IConfigurationService).getValue<string>('window.titleBarStyle') !== 'native') {
return false;
if (isMacintosh || accessor.get(IConfigurationService).getValue<string>('window.titleBarStyle') === 'native') {
const webview = getActiveElectronBasedWebview(accessor);
if (webview) {
f(webview);
return true;
}
}
const webview = getActiveElectronBasedWebview(accessor);
if (webview) {
f(webview);
return true;
}
return false;
});
}