maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix #76561

Browse source
This commit is contained in:
Benjamin Pasero 2019-07-04 13:56:49 +02:00
parent 05f8ca5b40
commit f2f5a6c3e1
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/workbench/browser/parts/notifications/notificationsStatus.ts
View file

@ -65,7 +65,7 @@ export class NotificationsStatus extends Disposable {
}; };
if (!this.notificationsCenterStatusItem) { if (!this.notificationsCenterStatusItem) {
this.notificationsCenterStatusItem = this.statusbarService.addEntry(statusProperties, 'status.notifications', localize('status.notifications', "Notifications"), StatusbarAlignment.RIGHT, -1000 /* towards the far end of the right hand side */); this.notificationsCenterStatusItem = this.statusbarService.addEntry(statusProperties, 'status.notifications', localize('status.notifications', "Notifications"), StatusbarAlignment.RIGHT, -Number.MAX_VALUE /* towards the far end of the right hand side */);
} else { } else {
this.notificationsCenterStatusItem.update(statusProperties); this.notificationsCenterStatusItem.update(statusProperties);
} }

13
src/vs/workbench/browser/parts/statusbar/statusbarPart.ts
View file

@ -229,9 +229,16 @@ class StatusbarViewModel extends Disposable {
} }
private sort(): void { private sort(): void {
const mapEntryToIndex = new Map<IStatusbarViewModelEntry, number>();
this._entries.forEach((entry, index) => mapEntryToIndex.set(entry, index));
this._entries.sort((entryA, entryB) => { this._entries.sort((entryA, entryB) => {
if (entryA.alignment === entryB.alignment) { if (entryA.alignment === entryB.alignment) {
return entryB.priority - entryA.priority; // higher priority towards the left if (entryA.priority !== entryB.priority) {
return entryB.priority - entryA.priority; // higher priority towards the left
}
return mapEntryToIndex.get(entryA)! - mapEntryToIndex.get(entryB)!; // otherwise maintain stable order
} }
if (entryA.alignment === StatusbarAlignment.LEFT) { if (entryA.alignment === StatusbarAlignment.LEFT) {
@ -395,7 +402,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
private doAddEntry(entry: IStatusbarEntry, id: string, name: string, alignment: StatusbarAlignment, priority: number): IStatusbarEntryAccessor { private doAddEntry(entry: IStatusbarEntry, id: string, name: string, alignment: StatusbarAlignment, priority: number): IStatusbarEntryAccessor {
// Create item // Create item
const itemContainer = this.doCreateStatusItem(id, name, alignment, priority, ...coalesce([entry.showBeak ? 'has-beak' : undefined])); const itemContainer = this.doCreateStatusItem(id, alignment, ...coalesce([entry.showBeak ? 'has-beak' : undefined]));
const item = this.instantiationService.createInstance(StatusbarEntryItem, itemContainer, entry); const item = this.instantiationService.createInstance(StatusbarEntryItem, itemContainer, entry);
// Append to parent // Append to parent
@ -585,7 +592,7 @@ export class StatusbarPart extends Part implements IStatusbarService {
this.styleElement.innerHTML = `.monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak:before { border-bottom-color: ${backgroundColor}; }`; this.styleElement.innerHTML = `.monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak:before { border-bottom-color: ${backgroundColor}; }`;
} }
private doCreateStatusItem(id: string, name: string, alignment: StatusbarAlignment, priority: number = 0, ...extraClasses: string[]): HTMLElement { private doCreateStatusItem(id: string, alignment: StatusbarAlignment, ...extraClasses: string[]): HTMLElement {
const itemContainer = document.createElement('div'); const itemContainer = document.createElement('div');
itemContainer.id = id; itemContainer.id = id;

2
src/vs/workbench/contrib/tasks/browser/task.contribution.ts
View file

@ -125,7 +125,7 @@ export class TaskStatusBarContributions extends Disposable implements IWorkbench
}; };
if (!this.runningTasksStatusItem) { if (!this.runningTasksStatusItem) {
this.runningTasksStatusItem = this.statusbarService.addEntry(itemProps, 'status.runningTasks', nls.localize('status.runningTasks', "Running Tasks"), StatusbarAlignment.LEFT, 50 /* Medium Priority */); this.runningTasksStatusItem = this.statusbarService.addEntry(itemProps, 'status.runningTasks', nls.localize('status.runningTasks', "Running Tasks"), StatusbarAlignment.LEFT, 49 /* Medium Priority, next to Markers */);
} else { } else {
this.runningTasksStatusItem.update(itemProps); this.runningTasksStatusItem.update(itemProps);
} }