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

Merge pull request #173368 from rehmsen/terminal_welcome_view_switch

Browse source 
Layout when switching from welcome to terminal.
This commit is contained in:
Daniel Imms 2023-10-31 11:51:37 -07:00 committed by GitHub
parent 6384066be7 13df0753e3
commit fb1c770dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/vs/workbench/contrib/terminal/browser/terminalView.ts
View file

@ -53,7 +53,6 @@ export class TerminalViewPane extends ViewPane {
private _parentDomElement: HTMLElement | undefined;
private _terminalTabbedView?: TerminalTabbedView;
get terminalTabbedView(): TerminalTabbedView | undefined { return this._terminalTabbedView; }
private _isWelcomeShowing: boolean = false;
private _isInitialized: boolean = false;
private _newDropdown: DropdownWithPrimaryActionViewItem | undefined;
private readonly _dropdownMenu: IMenu;
@ -87,13 +86,18 @@ export class TerminalViewPane extends ViewPane {
}));
this._register(this._terminalService.onDidChangeInstances(() => {
if (!this._isWelcomeShowing) {
return;
// If the first terminal is opened, hide the welcome view
// and if the last one is closed, show it again
if (this._hasWelcomeScreen() && this._terminalService.instances.length <= 1) {
this._onDidChangeViewWelcomeState.fire();
}
this._isWelcomeShowing = true;
this._onDidChangeViewWelcomeState.fire();
if (!this._terminalTabbedView && this._parentDomElement) {
if (!this._parentDomElement) { return; }
// If we do not have the tab view yet, create it now.
if (!this._terminalTabbedView) {
this._createTabsView();
}
// If we just opened our first terminal, layout
if (this._terminalService.instances.length === 1) {
this.layoutBody(this._parentDomElement.offsetHeight, this._parentDomElement.offsetWidth);
}
}));
@ -200,7 +204,7 @@ export class TerminalViewPane extends ViewPane {
this._register(this.onDidChangeBodyVisibility(async visible => {
this._viewShowing.set(visible);
if (visible) {
if (!this._terminalService.isProcessSupportRegistered) {
if (this._hasWelcomeScreen()) {
this._onDidChangeViewWelcomeState.fire();
}
this._initializeTerminal(false);
@ -319,9 +323,12 @@ export class TerminalViewPane extends ViewPane {
}
}
private _hasWelcomeScreen(): boolean {
return !this._terminalService.isProcessSupportRegistered;
}
override shouldShowWelcome(): boolean {
this._isWelcomeShowing = !this._terminalService.isProcessSupportRegistered && this._terminalService.instances.length === 0;
return this._isWelcomeShowing;
return this._hasWelcomeScreen() && this._terminalService.instances.length === 0;
}
}