Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-09 10:42:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

SCM - fix input box action button regression (#199739)

Browse Source
This commit is contained in:
Ladislau Szomoru
2023-12-01 10:54:54 +01:00
committed by GitHub
parent e40a5892d7
commit f900fcf1df
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/scm/browser/scmViewPane.ts
+15 -4
View File
@@ -2088,9 +2088,6 @@ class SCMInputWidget {
this.actionBar.push(action, { icon: true, label: false });
}
const showInputActionButton = this.configurationService.getValue<boolean>('scm.showInputActionButton') === true;
this.actionBar.domNode.classList.toggle('hidden', !showInputActionButton || this.actionBar.isEmpty());
this.layout();
};
@@ -2330,7 +2327,7 @@ class SCMInputWidget {
layout(): void {
const editorHeight = this.getContentHeight();
const toolbarWidth = this.toolbarContainer.clientWidth;
const toolbarWidth = this.getToolbarWidth();
const dimension = new Dimension(this.element.clientWidth - toolbarWidth, editorHeight);
if (dimension.width < 0) {
@@ -2343,6 +2340,9 @@ class SCMInputWidget {
this.placeholderTextContainer.style.width = `${dimension.width}px`;
this.renderValidation();
this.actionBar.domNode.classList.toggle('hidden', this.actionBar.isEmpty());
this.toolbarContainer.classList.toggle('hidden', this.configurationService.getValue<boolean>('scm.showInputActionButton') === false);
if (this.shouldFocusAfterLayout) {
this.shouldFocusAfterLayout = false;
this.focus();
@@ -2473,6 +2473,17 @@ class SCMInputWidget {
return maxLines * lineHeight + top + bottom;
}
private getToolbarWidth(): number {
const showInputActionButton = this.configurationService.getValue<boolean>('scm.showInputActionButton');
const actionCount = this.toolbarContextKeyService.getContextKeyValue<number>(SCMInputContextKeys.ActionCount.key) ?? 0;
if (!showInputActionButton || (this.actionBar.isEmpty() && actionCount === 0)) {
return 0;
}
return 26; /* 22px action + 4px margin */
}
private computeLineHeight(fontSize: number): number {
return Math.round(fontSize * 1.5);
}