Skip to content

Commit 4800762

Browse files
committed
Fix setting deprecation message overflowing other rows
Fix microsoft#84007
1 parent 709e173 commit 4800762

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/vs/workbench/contrib/preferences/browser/media/settingsEditor2.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,11 @@
346346
margin-top: 3px;
347347
user-select: text;
348348
-webkit-user-select: text;
349+
display: none;
350+
}
351+
352+
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents.is-deprecated .setting-item-deprecation-message {
353+
display: block;
349354
}
350355

351356
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-description {
@@ -354,10 +359,6 @@
354359
-webkit-user-select: text;
355360
}
356361

357-
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-deprecation-message {
358-
position: absolute;
359-
}
360-
361362
.settings-editor > .settings-body > .settings-tree-container .setting-item-contents .setting-item-validation-message {
362363
display: none;
363364
}

src/vs/workbench/contrib/preferences/browser/settingsTree.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,10 @@ export abstract class AbstractSettingRenderer extends Disposable implements ITre
467467
}
468468

469469
const onChange = (value: any) => this._onDidChangeSetting.fire({ key: element.setting.key, value, type: template.context!.valueType });
470-
template.deprecationWarningElement.innerText = element.setting.deprecationMessage || '';
470+
const deprecationText = element.setting.deprecationMessage || '';
471+
template.deprecationWarningElement.innerText = deprecationText;
472+
DOM.toggleClass(template.containerElement, 'is-deprecated', !!deprecationText);
473+
471474
this.renderValue(element, <ISettingItemTemplate>template, onChange);
472475

473476
}

0 commit comments

Comments
 (0)