提交 85714e10 编写于 作者: J Johannes Rieken

clamp suggest line height between 8 and 100, https://github.com/microsoft/vscode/issues/110078

上级 e416cba1
...@@ -4260,7 +4260,7 @@ export const EditorOptions = { ...@@ -4260,7 +4260,7 @@ export const EditorOptions = {
suggestLineHeight: register(new EditorIntOption( suggestLineHeight: register(new EditorIntOption(
EditorOption.suggestLineHeight, 'suggestLineHeight', EditorOption.suggestLineHeight, 'suggestLineHeight',
0, 0, 1000, 0, 0, 1000,
{ markdownDescription: nls.localize('suggestLineHeight', "Line height for the suggest widget. When set to `0`, the value of `#editor.lineHeight#` is used.") } { markdownDescription: nls.localize('suggestLineHeight', "Line height for the suggest widget. When set to `0`, the value of `#editor.lineHeight#` is used. The minimum value is 8.") }
)), )),
suggestOnTriggerCharacters: register(new EditorBooleanOption( suggestOnTriggerCharacters: register(new EditorBooleanOption(
EditorOption.suggestOnTriggerCharacters, 'suggestOnTriggerCharacters', true, EditorOption.suggestOnTriggerCharacters, 'suggestOnTriggerCharacters', true,
......
...@@ -32,6 +32,7 @@ import { getAriaId, ItemRenderer } from './suggestWidgetRenderer'; ...@@ -32,6 +32,7 @@ import { getAriaId, ItemRenderer } from './suggestWidgetRenderer';
import { ResizableHTMLElement } from './resizable'; import { ResizableHTMLElement } from './resizable';
import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget';
import { IPosition } from 'vs/editor/common/core/position'; import { IPosition } from 'vs/editor/common/core/position';
import { clamp } from 'vs/base/common/numbers';
/** /**
* Suggest widget colors * Suggest widget colors
...@@ -829,7 +830,7 @@ export class SuggestWidget implements IDisposable { ...@@ -829,7 +830,7 @@ export class SuggestWidget implements IDisposable {
getLayoutInfo() { getLayoutInfo() {
const fontInfo = this.editor.getOption(EditorOption.fontInfo); const fontInfo = this.editor.getOption(EditorOption.fontInfo);
const itemHeight = this.editor.getOption(EditorOption.suggestLineHeight) || fontInfo.lineHeight; const itemHeight = clamp(this.editor.getOption(EditorOption.suggestLineHeight) || fontInfo.lineHeight, 8, 1000);
const statusBarHeight = !this.editor.getOption(EditorOption.suggest).showStatusBar || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight; const statusBarHeight = !this.editor.getOption(EditorOption.suggest).showStatusBar || this._state === State.Empty || this._state === State.Loading ? 0 : itemHeight;
const borderWidth = this._details.widget.borderWidth; const borderWidth = this._details.widget.borderWidth;
const borderHeight = 2 * borderWidth; const borderHeight = 2 * borderWidth;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册