Skip to content

Commit

Permalink
Increase activity bar space at top and bottom (microsoft#207262)
Browse files Browse the repository at this point in the history
Give more space to activity bar when top / bottom
  • Loading branch information
benibenj committed Mar 11, 2024
1 parent 0a82e79 commit 12fc367
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/vs/workbench/browser/media/part.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
overflow: hidden;
}

.monaco-workbench .part > .title,
.monaco-workbench .part > .header-or-footer {
.monaco-workbench .part > .title {
padding-left: 8px;
padding-right: 8px;
}
Expand Down
2 changes: 2 additions & 0 deletions src/vs/workbench/browser/parts/media/paneCompositePart.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
}

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

Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/browser/parts/paneCompositePart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,8 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos

private layoutCompositeBar(): void {
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());
this.paneCompositeBar.value.layout(availableWidth, this.dimension.height);
}
Expand Down Expand Up @@ -578,7 +579,7 @@ export abstract class AbstractPaneCompositePart extends CompositePart<PaneCompos
// Each toolbar item has 4px margin in the panel toolbar
const toolBarWidth = this.toolBar.getItemsWidth() + this.toolBar.getItemsLength() * 4;
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 {
Expand Down
4 changes: 4 additions & 0 deletions src/vs/workbench/browser/parts/panel/panelPart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
let dimensions: Dimension;
if (this.layoutService.getPanelPosition() === Position.RIGHT) {
Expand Down

0 comments on commit 12fc367

Please sign in to comment.