development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix centering, use action bar for +

Browse source 
Fixes #121234
This commit is contained in:
Daniel Imms 2021-04-14 06:47:21 -07:00
parent fd640b0b32
commit b2d002de4b
No known key found for this signature in database
GPG key ID: D12BE8272D6284CC
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vs/workbench/contrib/terminal/browser/media/terminal.css
View file

@ -207,13 +207,12 @@
overflow: hidden;
}
.monaco-workbench .pane-body.integrated-terminal .plus-button {
.monaco-workbench .pane-body.integrated-terminal .tabs-container > .monaco-action-bar {
text-align: center;
z-index: 10;
padding: 4px 10px;
}
.monaco-workbench .pane-body.integrated-terminal .tabs-container.has-text .plus-button {
.monaco-workbench .pane-body.integrated-terminal .tabs-container.has-text > .monaco-action-bar {
text-align: left;
}

17
src/vs/workbench/contrib/terminal/browser/terminalTabbedView.ts
View file

@ -29,6 +29,8 @@ import { newTerminalIcon } from 'vs/workbench/contrib/terminal/browser/terminalI
import { ICommandService } from 'vs/platform/commands/common/commands';
import { ContextMenuTabsGroup } from 'vs/workbench/contrib/terminal/browser/terminalActions';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
import { Codicon } from 'vs/base/common/codicons';
const $ = dom.$;
@ -148,7 +150,8 @@ export class TerminalTabbedView extends Disposable {
return parseInt(storedValue);
}
private _setLastWidgetWidth(): void {
private _handleOnDidSashChange(): void {
this._refreshHasTextClass();
let widgetWidth = this._splitView.getViewSize(this._tabTreeIndex);
if (!this._width || widgetWidth <= 0) {
return;
@ -178,7 +181,7 @@ export class TerminalTabbedView extends Disposable {
private _setupSplitView(): void {
this._register(this._splitView.onDidSashReset(() => this._splitView.resizeView(this._tabTreeIndex, DEFAULT_TABS_WIDGET_WIDTH)));
this._register(this._splitView.onDidSashChange(() => this._setLastWidgetWidth()));
this._register(this._splitView.onDidSashChange(() => this._handleOnDidSashChange()));
if (this._showTabs) {
this._addTabTree();
@ -208,13 +211,17 @@ export class TerminalTabbedView extends Disposable {
layout(width: number, height: number): void {
this._height = height;
this._width = width;
this._tabTreeContainer.classList.toggle('has-text', this._tabTreeContainer.clientWidth >= DEFAULT_TABS_WIDGET_WIDTH);
this._refreshHasTextClass();
this._splitView.layout(width);
if (this._showTabs) {
this._splitView.resizeView(this._tabTreeIndex, this._getLastWidgetWidth());
}
}
private _refreshHasTextClass() {
this._tabTreeContainer.classList.toggle('has-text', this._tabTreeContainer.clientWidth >= DEFAULT_TABS_WIDGET_WIDTH);
}
private _createButton(): void {
const button = dom.$(ThemeIcon.asCSSSelector(newTerminalIcon), { tabindex: 0, role: 'button', title: nls.localize('addTerminal', "Create Terminal") });
button.classList.add('plus-button');
@ -224,8 +231,8 @@ export class TerminalTabbedView extends Disposable {
await this._openTabsContextMenu(e);
}));
this._tabTreeContainer.appendChild(button);
this._plusButton = button;
const actionBar = new ActionBar(this._tabTreeContainer);
actionBar.push(this._instantiationService.createInstance(MenuItemAction, { id: TERMINAL_COMMAND_ID.NEW, title: nls.localize('terminal.new', "New Terminal"), icon: Codicon.plus }, undefined, undefined), { icon: true, label: false });
}
private _updateTheme(theme?: IColorTheme): void {