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.

Sign up for GitHub

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

Jump to bottom

Fixes editor has wrong height when toggling tabs with breadcrumbs visible #97502

Merged
merged 3 commits into from May 12, 2020
Merged

Fixes editor has wrong height when toggling tabs with breadcrumbs visible #97502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fdc9d7
Fixes #97021
jeanp413 May 11, 2020
dffee96
Avoid calling relayout too often
jeanp413 May 11, 2020
0b386fe
relayout on options change
bpasero May 12, 2020
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
8 changes: 4 additions & 4 deletions src/vs/workbench/browser/parts/editor/editorGroupView.ts
View file
Open in desktop
Expand Up @@ -596,11 +596,11 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
// Title control Switch between showing tabs <=> not showing tabs
if (event.oldPartOptions.showTabs !== event.newPartOptions.showTabs) {

// Recreate and layout control
// Recreate title control
this.createTitleAreaControl();
if (this.dimension) {
this.layoutTitleAreaControl(this.dimension.width);
}

// Re-layout
this.relayout();

// Ensure to show active editor if any
if (this._group.activeEditor) {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
View file
Open in desktop
Expand Up @@ -232,7 +232,7 @@ export class NoTabsTitleControl extends TitleControl {
private redraw(): void {
const editor = withNullAsUndefined(this.group.activeEditor);

const isEditorPinned = this.group.activeEditor ? this.group.isPinned(this.group.activeEditor) : false;
const isEditorPinned = editor ? this.group.isPinned(editor) : false;
const isGroupActive = this.accessor.activeGroup === this.group;

this.activeLabel = { editor, pinned: isEditorPinned };
Expand Down