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 newline in tree item label makes label unreadable #163995

Merged
merged 1 commit into from Oct 19, 2022
Merged

Fixes newline in tree item label makes label unreadable #163995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/vs/workbench/browser/labels.ts
View file
Open in desktop
Expand Up @@ -542,6 +542,7 @@ class ResourceLabelWidget extends IconLabel {
separator: this.options?.separator,
domId: this.options?.domId,
disabledCommand: this.options?.disabledCommand,
labelEscapeNewLines: this.options?.labelEscapeNewLines
};

const resource = toResource(this.label);
Expand Down
4 changes: 0 additions & 4 deletions src/vs/workbench/browser/parts/views/media/views.css
View file
Open in desktop
Expand Up @@ -119,10 +119,6 @@
overflow: hidden;
flex-wrap: nowrap;
padding-left: 3px;
/* Supported everywhere: https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-line-clamp#browser_compatibility */
-webkit-line-clamp: 1;
display: -webkit-box;
-webkit-box-orient: vertical;
}

.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox {
Expand Down
6 changes: 4 additions & 2 deletions src/vs/workbench/browser/parts/views/treeView.ts
View file
Open in desktop
Expand Up @@ -1162,7 +1162,8 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
extraClasses: ['custom-view-tree-node-item-resourceLabel'],
matches: matches ? matches : createMatches(element.filterData),
strikethrough: treeItemLabel?.strikethrough,
disabledCommand: !commandEnabled
disabledCommand: !commandEnabled,
labelEscapeNewLines: true
});
} else {
templateData.resourceLabel.setResource({ name: label, description }, {
Expand All @@ -1171,7 +1172,8 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
extraClasses: ['custom-view-tree-node-item-resourceLabel'],
matches: matches ? matches : createMatches(element.filterData),
strikethrough: treeItemLabel?.strikethrough,
disabledCommand: !commandEnabled
disabledCommand: !commandEnabled,
labelEscapeNewLines: true
});
}

Expand Down