Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix two action bars #194264

Merged
merged 1 commit into from
Sep 27, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
if (didChange) {
// HACK: To render all editor tabs on startup, otherwise only one row gets rendered
otherTabController.openEditors([]);

this.handleOpenedEditors();
}
return didChange;
}
Expand All @@ -72,7 +74,17 @@ export class MultiRowEditorControl extends Disposable implements IEditorTabsCont
const didChangeOpenEditorsSticky = this.stickyEditorTabsControl.openEditors(stickyEditors);
const didChangeOpenEditorsUnSticky = this.unstickyEditorTabsControl.openEditors(unstickyEditors);

return didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky;
const didChange = didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky;

if (didChange) {
this.handleOpenedEditors();
}

return didChange;
}

private handleOpenedEditors(): void {
this.handlePinnedTabsSeparateRowToolbars();
}

beforeCloseEditor(editor: EditorInput): void {
Expand Down