mirror of
https://github.com/Microsoft/vscode
synced 2024-08-27 21:09:43 +00:00
SCM - update settings to be consistent with other settings (#201078)
This commit is contained in:
parent
d696b40313
commit
dbbf1dc671
|
@ -255,14 +255,14 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration).regis
|
|||
markdownDescription: localize('inputFontSize', "Controls the font size for the input message in pixels."),
|
||||
default: 13
|
||||
},
|
||||
'scm.inputMaxLines': {
|
||||
'scm.inputMaxLineCount': {
|
||||
type: 'number',
|
||||
markdownDescription: localize('inputMaxLines', "Controls the maximum number of lines that the input will auto-grow to."),
|
||||
minimum: 1,
|
||||
maximum: 50,
|
||||
default: 10
|
||||
},
|
||||
'scm.inputMinLines': {
|
||||
'scm.inputMinLineCount': {
|
||||
type: 'number',
|
||||
markdownDescription: localize('inputMinLines', "Controls the minimum number of lines that the input will auto-grow from."),
|
||||
minimum: 1,
|
||||
|
|
|
@ -2267,11 +2267,11 @@ class SCMInputWidget {
|
|||
const lineHeight = this.computeLineHeight(fontSize);
|
||||
const { top, bottom } = this.inputEditor.getOption(EditorOption.padding);
|
||||
|
||||
const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLines');
|
||||
const inputMinLinesConfig = this.configurationService.getValue('scm.inputMinLineCount');
|
||||
const inputMinLines = typeof inputMinLinesConfig === 'number' ? clamp(inputMinLinesConfig, 1, 50) : 1;
|
||||
const editorMinHeight = inputMinLines * lineHeight + top + bottom;
|
||||
|
||||
const inputMaxLinesConfig = this.configurationService.getValue('scm.inputMaxLines');
|
||||
const inputMaxLinesConfig = this.configurationService.getValue('scm.inputMaxLineCount');
|
||||
const inputMaxLines = typeof inputMaxLinesConfig === 'number' ? clamp(inputMaxLinesConfig, 1, 50) : 10;
|
||||
const editorMaxHeight = inputMaxLines * lineHeight + top + bottom;
|
||||
|
||||
|
@ -2648,8 +2648,8 @@ export class SCMViewPane extends ViewPane {
|
|||
e.affectsConfiguration('scm.alwaysShowRepositories') ||
|
||||
e.affectsConfiguration('scm.showIncomingChanges') ||
|
||||
e.affectsConfiguration('scm.showOutgoingChanges') ||
|
||||
e.affectsConfiguration('scm.inputMinLines') ||
|
||||
e.affectsConfiguration('scm.inputMaxLines')) {
|
||||
e.affectsConfiguration('scm.inputMinLineCount') ||
|
||||
e.affectsConfiguration('scm.inputMaxLineCount')) {
|
||||
this._showActionButton = this.configurationService.getValue<boolean>('scm.showActionButton');
|
||||
this._alwaysShowRepositories = this.configurationService.getValue<boolean>('scm.alwaysShowRepositories');
|
||||
this._showIncomingChanges = this.configurationService.getValue<ShowChangesSetting>('scm.showIncomingChanges');
|
||||
|
|
Loading…
Reference in a new issue