diff --git a/src/vs/code/electron-sandbox/workbench/workbench.ts b/src/vs/code/electron-sandbox/workbench/workbench.ts index 8e924097620c7..47c3d28a6fcdc 100644 --- a/src/vs/code/electron-sandbox/workbench/workbench.ts +++ b/src/vs/code/electron-sandbox/workbench/workbench.ts @@ -193,7 +193,7 @@ } } - // part: auxiliary sidebar (only when width > 0) + // part: auxiliary sidebar if (layoutInfo.auxiliarySideBarWidth > 0) { const auxSideDiv = document.createElement('div'); auxSideDiv.style.position = 'absolute'; diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts index 3a4b9c01ad120..7911e0221da90 100644 --- a/src/vs/platform/theme/common/themeService.ts +++ b/src/vs/platform/theme/common/themeService.ts @@ -239,6 +239,6 @@ export interface IPartsSplash { export interface IPartsSplashWorkspaceOverride { layoutInfo: { - auxiliarySideBarWidth: [number, string[] /* workspace ID */]; + auxiliarySideBarWidth: [number, string[] /* workspace identifier the override applies to */]; }; } diff --git a/src/vs/platform/theme/electron-main/themeMainService.ts b/src/vs/platform/theme/electron-main/themeMainService.ts index ff8ab9317f375..90d2be8dc27bf 100644 --- a/src/vs/platform/theme/electron-main/themeMainService.ts +++ b/src/vs/platform/theme/electron-main/themeMainService.ts @@ -208,7 +208,7 @@ export class ThemeMainService extends Disposable implements IThemeMainService { } } else { const index = workspaceIds.indexOf(workspace.id); - if (index !== -1) { + if (index > -1) { workspaceIds.splice(index, 1); changed = true; } @@ -244,13 +244,13 @@ export class ThemeMainService extends Disposable implements IThemeMainService { return { ...partSplash, - layoutInfo: partSplash.layoutInfo ? { + layoutInfo: { ...partSplash.layoutInfo, // Only apply an auxiliary bar width when we have a workspace specific // override. Auxiliary bar is not visible by default unless explicitly // opened in a workspace. auxiliarySideBarWidth: typeof auxiliarySideBarWidthOverride === 'number' ? auxiliarySideBarWidthOverride : 0 - } : undefined + } }; }