Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Status bar: make neighbour items look good when there are multiple (fix #216637) (#216678)

Browse Source
This commit is contained in:
Benjamin Pasero
2024-06-20 09:28:27 +02:00
committed by GitHub
parent a3017010e9
commit 13d82c160e
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/statusbar/media/statusbarpart.css
+5
View File
@@ -88,6 +88,11 @@
margin-left: 3px;
}
.monaco-workbench .part.statusbar > .items-container > .statusbar-item.compact-left.compact-right > .statusbar-item-label {
margin-right:0;
margin-left: 0;
}
.monaco-workbench .part.statusbar > .items-container > .statusbar-item.left.first-visible-item {
padding-left: 7px; /* Add padding to the most left status bar item */
}
src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
+20 -7
View File
@@ -433,7 +433,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
}
// Figure out groups of entries with `compact` alignment
const compactEntryGroups = new Map<string, Set<IStatusbarViewModelEntry>>();
const compactEntryGroups = new Map<string, Map<string, IStatusbarViewModelEntry>>();
for (const entry of mapIdToVisibleEntry.values()) {
if (
isStatusbarEntryLocation(entry.priority.primary) && // entry references another entry as location
@@ -448,11 +448,25 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
// Build a map of entries that are compact among each other
let compactEntryGroup = compactEntryGroups.get(locationId);
if (!compactEntryGroup) {
compactEntryGroup = new Set<IStatusbarViewModelEntry>([entry, location]);
compactEntryGroups.set(locationId, compactEntryGroup);
} else {
compactEntryGroup.add(entry);
// It is possible that this entry references another entry
// that itself references an entry. In that case, we want
// to add it to the entries of the referenced entry.
for (const group of compactEntryGroups.values()) {
if (group.has(locationId)) {
compactEntryGroup = group;
break;
}
}
if (!compactEntryGroup) {
compactEntryGroup = new Map<string, IStatusbarViewModelEntry>();
compactEntryGroups.set(locationId, compactEntryGroup);
}
}
compactEntryGroup.set(entry.id, entry);
compactEntryGroup.set(location.id, location);
// Adjust CSS classes to move compact items closer together
if (entry.priority.primary.alignment === StatusbarAlignment.LEFT) {
@@ -465,7 +479,6 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
}
}
// Install mouse listeners to update hover feedback for
// all compact entries that belong to each other
const statusBarItemHoverBackground = this.getColor(STATUS_BAR_ITEM_HOVER_BACKGROUND);
@@ -473,7 +486,7 @@ class StatusbarPart extends Part implements IStatusbarEntryContainer {
this.compactEntriesDisposable.value = new DisposableStore();
if (statusBarItemHoverBackground && statusBarItemCompactHoverBackground && !isHighContrast(this.theme.type)) {
for (const [, compactEntryGroup] of compactEntryGroups) {
for (const compactEntry of compactEntryGroup) {
for (const compactEntry of compactEntryGroup.values()) {
if (!compactEntry.hasCommand) {
continue; // only show hover feedback when we have a command
}