Skip to content

Commit

Permalink
Copilot Icon is shown far right after global VS Code settings icon (fix
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero authored Feb 24, 2025
1 parent c99a522 commit e25a69a
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -636,15 +636,6 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
}
}

// --- Activity Actions
if (this.activityActionsEnabled) {
if (isAccountsActionVisible(this.storageService)) {
actions.primary.push(ACCOUNTS_ACTIVITY_TILE_ACTION);
}

actions.primary.push(GLOBAL_ACTIVITY_TITLE_ACTION);
}

// --- Global Actions
const globalToolbarActions = this.globalToolbarMenu.getActions();
this.hasGlobalToolbarEntries = globalToolbarActions.length > 0;
Expand All @@ -653,7 +644,7 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
actions
);

// --- Layout Actions (always at the end)
// --- Layout Actions
if (this.layoutToolbarMenu) {
fillInActionBarActions(
this.layoutToolbarMenu.getActions(),
Expand All @@ -662,6 +653,15 @@ export class BrowserTitlebarPart extends Part implements ITitlebarPart {
);
}

// --- Activity Actions (always at the end)
if (this.activityActionsEnabled) {
if (isAccountsActionVisible(this.storageService)) {
actions.primary.push(ACCOUNTS_ACTIVITY_TILE_ACTION);
}

actions.primary.push(GLOBAL_ACTIVITY_TITLE_ACTION);
}

this.actionToolBar.setActions(prepareActions(actions.primary), prepareActions(actions.secondary));
};

Expand Down

0 comments on commit e25a69a

Please sign in to comment.