Increase activity bar space at top and bottom (#207262)

Give more space to activity bar when top / bottom
This commit is contained in:
Benjamin Christopher Simmonds 2024-03-11 03:00:38 +01:00 committed by GitHub
parent 0a82e795ab
commit 12fc36731b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 4 deletions

View file

@ -35,8 +35,7 @@
overflow: hidden; overflow: hidden;
} }
.monaco-workbench .part > .title, .monaco-workbench .part > .title {
.monaco-workbench .part > .header-or-footer {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
} }

View file

@ -21,6 +21,8 @@
} }
.monaco-workbench .pane-composite-part > .header-or-footer { .monaco-workbench .pane-composite-part > .header-or-footer {
padding-left: 4px;
padding-right: 4px;
background-color: var(--vscode-activityBarTop-background); background-color: var(--vscode-activityBarTop-background);
} }

View file

@ -545,7 +545,8 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
private layoutCompositeBar(): void { private layoutCompositeBar(): void {
if (this.contentDimension && this.dimension && this.paneCompositeBar.value) { if (this.contentDimension && this.dimension && this.paneCompositeBar.value) {
let availableWidth = this.contentDimension.width - 16; // take padding into account const padding = this.compositeBarPosition === CompositeBarPosition.TITLE ? 16 : 8;
let availableWidth = this.contentDimension.width - padding;
availableWidth = Math.max(AbstractPaneCompositePart.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth()); availableWidth = Math.max(AbstractPaneCompositePart.MIN_COMPOSITE_BAR_WIDTH, availableWidth - this.getToolbarWidth());
this.paneCompositeBar.value.layout(availableWidth, this.dimension.height); this.paneCompositeBar.value.layout(availableWidth, this.dimension.height);
} }
@ -578,7 +579,7 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
// Each toolbar item has 4px margin in the panel toolbar // Each toolbar item has 4px margin in the panel toolbar
const toolBarWidth = this.toolBar.getItemsWidth() + this.toolBar.getItemsLength() * 4; const toolBarWidth = this.toolBar.getItemsWidth() + this.toolBar.getItemsLength() * 4;
const globalToolBarWidth = this.globalToolBar ? this.globalToolBar.getItemsWidth() + this.globalToolBar.getItemsLength() * 4 : 0; const globalToolBarWidth = this.globalToolBar ? this.globalToolBar.getItemsWidth() + this.globalToolBar.getItemsLength() * 4 : 0;
return 5 + toolBarWidth + globalToolBarWidth; // 5px toolBar padding-left return toolBarWidth + globalToolBarWidth;
} }
private onTitleAreaContextMenu(event: StandardMouseEvent): void { private onTitleAreaContextMenu(event: StandardMouseEvent): void {

View file

@ -163,6 +163,10 @@ export class PanelPart extends AbstractPaneCompositePart {
]); ]);
} }
protected override getToolbarWidth(): number {
return super.getToolbarWidth() + 5; // 5px toolBar padding-left
}
override layout(width: number, height: number, top: number, left: number): void { override layout(width: number, height: number, top: number, left: number): void {
let dimensions: Dimension; let dimensions: Dimension;
if (this.layoutService.getPanelPosition() === Position.RIGHT) { if (this.layoutService.getPanelPosition() === Position.RIGHT) {