Commit 364f8b8

authored

Move primary buttons on the right of the dialogs (#1382)

Closes #1368.

1 parent 671d2ea commit 364f8b8Copy full SHA for 364f8b8

File tree

+19

-5

lines changed

+19

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -181,10 +181,10 @@ export class AdditionalUrlsDialog extends AbstractDialog<string[]> {`
`181`	`181`	`);`
`182`	`182`	`this.contentNode.appendChild(anchor);`
`183`	`183`
`184`		`- this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));`
`185`	`184`	`this.appendCloseButton(`
`186`	`185`	`nls.localize('vscode/issueMainService/cancel', 'Cancel')`
`187`	`186`	`);`
	`187`	`+ this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`get value(): string[] {`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,13 +126,13 @@ export class LibraryListWidget extends ListWidget<`
`126`	`126`	`),`
`127`	`127`	`message,`
`128`	`128`	`buttons: [`
`129`		`- nls.localize('arduino/library/installAll', 'Install all'),`
	`129`	`+ nls.localize('vscode/issueMainService/cancel', 'Cancel'),`
`130`	`130`	`nls.localize(`
`131`	`131`	`'arduino/library/installOnly',`
`132`	`132`	`'Install {0} only',`
`133`	`133`	`item.name`
`134`	`134`	`),`
`135`		`- nls.localize('vscode/issueMainService/cancel', 'Cancel'),`
	`135`	`+ nls.localize('arduino/library/installAll', 'Install all'),`
`136`	`136`	`],`
`137`	`137`	maxWidth: 740, // Aligned with `settings-dialog.css`.
`138`	`138`	`}).open();`
`@@ -201,7 +201,9 @@ class MessageBoxDialog extends AbstractDialog<MessageBoxDialog.Result> {`
`201`	`201`	`options.buttons \|\| [nls.localize('vscode/issueMainService/ok', 'OK')]`
`202`	`202`	`).forEach((text, index) => {`
`203`	`203`	`const button = this.createButton(text);`
`204`		`- button.classList.add(index === 0 ? 'main' : 'secondary');`
	`204`	`+ const isPrimaryButton =`
	`205`	`+ index === (options.buttons ? options.buttons.length - 1 : 0);`
	`206`	`+ button.classList.add(isPrimaryButton ? 'main' : 'secondary');`
`205`	`207`	`this.controlPanel.appendChild(button);`
`206`	`208`	`this.toDisposeOnDetach.push(`
`207`	`209`	`addEventListener(button, 'click', () => {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,4 +93,5 @@`
`93`	`93`
`94`	`94`	`.p-Widget.dialogOverlay .dialogBlock .dialogContent.additional-urls-dialog {`
`95`	`95`	`display: block;`
	`96`	`+ overflow: hidden;`
`96`	`97`	`}`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ export class WorkspaceInputDialog extends TheiaWorkspaceInputDialog {`
`14`	`14`	`constructor(`
`15`	`15`	`@inject(WorkspaceInputDialogProps)`
`16`	`16`	`protected override readonly props: WorkspaceInputDialogProps,`
`17`		`- @inject(LabelProvider) protected override readonly labelProvider: LabelProvider`
	`17`	`+ @inject(LabelProvider)`
	`18`	`+ protected override readonly labelProvider: LabelProvider`
`18`	`19`	`) {`
`19`	`20`	`super(props, labelProvider);`
`20`	`21`	`this.appendCloseButton(`
`@@ -41,4 +42,14 @@ export class WorkspaceInputDialog extends TheiaWorkspaceInputDialog {`
`41`	`42`	`this.errorMessageNode.innerText = DialogError.getMessage(error);`
`42`	`43`	`}`
`43`	`44`	`}`
	`45`	`+`
	`46`	`+ protected override appendCloseButton(text: string): HTMLButtonElement {`
	`47`	`+ this.closeButton = this.createButton(text);`
	`48`	`+ this.controlPanel.insertBefore(`
	`49`	`+ this.closeButton,`
	`50`	`+ this.controlPanel.lastChild`
	`51`	`+ );`
	`52`	`+ this.closeButton.classList.add('secondary');`
	`53`	`+ return this.closeButton;`
	`54`	`+ }`
`44`	`55`	`}`

Comments

(0)