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

fix #56245

Browse Source
This commit is contained in:
Johannes Rieken
2018-09-11 16:01:17 +02:00
parent e6d95f460d
commit ffa0993cb2
3 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/vs/code/electron-browser/workbench/workbench.js
View File

@@ -71,19 +71,21 @@ function showPartsSplash(configuration) {
data = void 0;
}
// minimal color configuration (works with or without persisted data)
const baseTheme = data ? data.baseTheme : configuration.highContrast ? 'hc-black' : 'vs-dark';
const shellBackground = data ? data.colorInfo.editorBackground : configuration.highContrast ? '#000000' : '#1E1E1E';
const shellForeground = data ? data.colorInfo.foreground : configuration.highContrast ? '#FFFFFF' : '#CCCCCC';
const style = document.createElement('style');
document.head.appendChild(style);
document.body.className = `monaco-shell ${baseTheme}`;
style.innerHTML = `.monaco-shell { background-color: ${shellBackground}; color: ${shellForeground}; }`;
if (data) {
const { layoutInfo, colorInfo, baseTheme } = data;
// set the theme base id used by images and some styles
document.body.className = `monaco-shell ${baseTheme}`;
// stylesheet that defines foreground and background color
style.innerHTML = `.monaco-shell { background-color: ${colorInfo.editorBackground}; color: ${colorInfo.foreground}; }`;
if (data && data.layoutInfo) {
// restore parts if possible (we might not always store layout info)
const { id, layoutInfo, colorInfo } = data;
const splash = document.createElement('div');
splash.id = data.id;
splash.id = id;
// ensure there is enough space
layoutInfo.sideBarWidth = Math.min(layoutInfo.sideBarWidth, window.innerWidth - (layoutInfo.activityBarWidth + layoutInfo.editorPartMinWidth));
@@ -105,9 +107,6 @@ function showPartsSplash(configuration) {
`;
}
document.body.appendChild(splash);
} else {
document.body.className = `monaco-shell ${configuration.highContrast ? 'hc-black' : 'vs-dark'}`;
style.innerHTML = `.monaco-shell { background-color: ${configuration.highContrast ? '#000000' : '#1E1E1E'}; color: ${configuration.highContrast ? '#FFFFFF' : '#CCCCCC'}; }`;
}
perf.mark('didShowPartsSplash');
@@ -134,4 +133,4 @@ function getLazyEnv() {
ipc.send('vscode:fetchShellEnv');
});
}
}