development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Panel visibility is not persisted/restored on vscode.dev after restart (fix #213885) (#214055)

Browse source 
* Panel visibility is not persisted/restored on vscode.dev after restart (fix #213885)

* 💄
This commit is contained in:
Benjamin Pasero 2024-06-02 00:52:10 +02:00 committed by GitHub
parent fca05df7d4
commit 60d7343892
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/vs/workbench/browser/layout.ts
View file

@ -14,7 +14,7 @@ import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
import { Position, Parts, PanelOpensMaximizedOptions, IWorkbenchLayoutService, positionFromString, positionToString, panelOpensMaximizedFromString, PanelAlignment, ActivityBarPosition, LayoutSettings, MULTI_WINDOW_PARTS, SINGLE_WINDOW_PARTS, ZenModeSettings, EditorTabsMode, EditorActionsLocation, shouldShowCustomTitleBar } from 'vs/workbench/services/layout/browser/layoutService';
import { isTemporaryWorkspace, IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
import { IStorageService, StorageScope, StorageTarget, WillSaveStateReason } from 'vs/platform/storage/common/storage';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { IConfigurationChangeEvent, IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ITitleService } from 'vs/workbench/services/title/browser/titleService';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
@ -208,11 +208,9 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
private getContainerDimension(container: HTMLElement): IDimension {
if (container === this.mainContainer) {
// main window
return this.mainContainerDimension;
return this.mainContainerDimension; // main window
} else {
// auxiliary window
return getClientArea(container);
return getClientArea(container); // auxiliary window
}
}
@ -1533,28 +1531,27 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
}));
}
this._register(this.storageService.onWillSaveState(willSaveState => {
if (willSaveState.reason === WillSaveStateReason.SHUTDOWN) {
// Side Bar Size
const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN)
? this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView)
: this.workbenchGrid.getViewSize(this.sideBarPartView).width;
this.stateModel.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, sideBarSize as number);
this._register(this.storageService.onWillSaveState(e => {
// Panel Size
const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView)
: (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.BOTTOM ? this.workbenchGrid.getViewSize(this.panelPartView).height : this.workbenchGrid.getViewSize(this.panelPartView).width);
this.stateModel.setInitializationValue(LayoutStateKeys.PANEL_SIZE, panelSize as number);
// Side Bar Size
const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN)
? this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView)
: this.workbenchGrid.getViewSize(this.sideBarPartView).width;
this.stateModel.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, sideBarSize as number);
// Auxiliary Bar Size
const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
? this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView)
: this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, auxiliaryBarSize as number);
// Panel Size
const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView)
: (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.BOTTOM ? this.workbenchGrid.getViewSize(this.panelPartView).height : this.workbenchGrid.getViewSize(this.panelPartView).width);
this.stateModel.setInitializationValue(LayoutStateKeys.PANEL_SIZE, panelSize as number);
this.stateModel.save(true, true);
}
// Auxiliary Bar Size
const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
? this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView)
: this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, auxiliaryBarSize as number);
this.stateModel.save(true, true);
}));
}
@ -1935,12 +1932,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
height: panelPosition === Position.BOTTOM ? this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_LAST_NON_MAXIMIZED_HEIGHT) : size.height
});
}
this.stateModel.setRuntimeValue(LayoutStateKeys.PANEL_WAS_LAST_MAXIMIZED, !isMaximized);
}
/**
* Returns whether or not the panel opens maximized
*/
private panelOpensMaximized(): boolean {
// The workbench grid currently prevents us from supporting panel maximization with non-center panel alignment
@ -2367,7 +2362,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
visible: !this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
};
const middleSection: ISerializedNode[] = this.arrangeMiddleSectionNodes({
activityBar: activityBarNode,
auxiliaryBar: auxiliaryBarNode,
@ -2717,6 +2711,7 @@ class LayoutStateModel extends Disposable {
if (oldValue !== undefined) {
return !oldValue;
}
return this.configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.DEFAULT;
}