DEV/microsoft_vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 00:04:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

layout - add and adopt experimentalSecondarySidebarForNewUsers (#252622)

Browse Source
This commit is contained in:
Benjamin Pasero 2025-06-27 14:00:13 +02:00 committed by GitHub
parent 095f1f6428
commit 3edfba1aef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/vs/workbench/browser/layout.ts
View File

@ -635,7 +635,8 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
this.stateModel.load({
mainContainerDimension: this._mainContainerDimension,
auxiliaryBarOpensMaximized: () => this.auxiliaryBarOpensMaximized(), // deferred as function because this depends on state
resetLayout: Boolean(this.layoutOptions?.resetLayout)
resetLayout: Boolean(this.layoutOptions?.resetLayout),
experimentalSecondarySidebarForNewUsers: ExperimentalSecondarySidebarForNewUsers.Off
});
this._register(this.stateModel.onDidChangeState(change => {
@ -2793,10 +2794,18 @@ enum LegacyWorkbenchLayoutSettings {
SIDEBAR_POSITION = 'workbench.sideBar.location', // Deprecated to UI State
}
// TODO@bpasero remove this experiment in the future
enum ExperimentalSecondarySidebarForNewUsers {
Off = 0,
Maximized = 1,
Half = 2
}
interface ILayoutStateLoadConfiguration {
readonly mainContainerDimension: IDimension;
readonly auxiliaryBarOpensMaximized: () => boolean;
readonly resetLayout: boolean;
readonly experimentalSecondarySidebarForNewUsers: ExperimentalSecondarySidebarForNewUsers;
}
class LayoutStateModel extends Disposable {
@ -2919,39 +2928,43 @@ class LayoutStateModel extends Disposable {
private applyOverrides(configuration: ILayoutStateLoadConfiguration): void {
// Override runtime values for auxiliary bar maximized state
const wasAuxiliaryBarMaximized = this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED);
const auxiliaryBarOpensMaximized = configuration.auxiliaryBarOpensMaximized();
const state = this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY);
if (wasAuxiliaryBarMaximized && !auxiliaryBarOpensMaximized) {
this.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, !state.sideBarVisible);
this.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, !state.panelVisible);
this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, !state.editorVisible);
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, !state.auxiliaryBarVisible);
this.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE));
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, false);
} else if (!wasAuxiliaryBarMaximized && auxiliaryBarOpensMaximized) {
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, {
sideBarVisible: !this.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN),
panelVisible: !this.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN),
editorVisible: !this.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN),
auxiliaryBarVisible: !this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
});
this.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, true);
this.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, true);
this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, true);
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, false);
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE, this.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE));
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, true);
// With experimental treatment for new users
if (
this.storageService.isNew(StorageScope.APPLICATION) &&
this.contextService.getWorkbenchState() === WorkbenchState.EMPTY &&
configuration.experimentalSecondarySidebarForNewUsers !== ExperimentalSecondarySidebarForNewUsers.Off
) {
if (configuration.experimentalSecondarySidebarForNewUsers === ExperimentalSecondarySidebarForNewUsers.Maximized) {
this.applyAuxiliaryBarMaximizedOverride();
} else if (configuration.experimentalSecondarySidebarForNewUsers === ExperimentalSecondarySidebarForNewUsers.Half) {
const mainContainerDimension = configuration.mainContainerDimension;
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, false);
this.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, mainContainerDimension.width / 2);
}
}
// Both editor and panel should not be hidden on startup
// unless auxiliary bar is maximized
// Without experimental treatment
else {
// Override runtime values for auxiliary bar maximized state
const wasAuxiliaryBarMaximized = this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED);
const auxiliaryBarOpensMaximized = configuration.auxiliaryBarOpensMaximized();
const state = this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY);
if (wasAuxiliaryBarMaximized && !auxiliaryBarOpensMaximized) {
this.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, !state.sideBarVisible);
this.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, !state.panelVisible);
this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, !state.editorVisible);
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, !state.auxiliaryBarVisible);
this.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE));
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, false);
} else if (!wasAuxiliaryBarMaximized && auxiliaryBarOpensMaximized) {
this.applyAuxiliaryBarMaximizedOverride();
}
}
// Both editor and panel should not be hidden on startup unless auxiliary bar is maximized
if (
this.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) &&
this.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN) &&
@ -2961,6 +2974,23 @@ class LayoutStateModel extends Disposable {
}
}
private applyAuxiliaryBarMaximizedOverride(): void {
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_VISIBILITY, {
sideBarVisible: !this.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN),
panelVisible: !this.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN),
editorVisible: !this.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN),
auxiliaryBarVisible: !this.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
});
this.setRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN, true);
this.setRuntimeValue(LayoutStateKeys.PANEL_HIDDEN, true);
this.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, true);
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN, false);
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_LAST_NON_MAXIMIZED_SIZE, this.getInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE));
this.setRuntimeValue(LayoutStateKeys.AUXILIARYBAR_WAS_LAST_MAXIMIZED, true);
}
save(workspace: boolean, global: boolean): void {
let key: keyof typeof LayoutStateKeys;